diff options
| author | das <das> | 2006-03-28 02:44:12 (GMT) |
|---|---|---|
| committer | das <das> | 2006-03-28 02:44:12 (GMT) |
| commit | eb472aefb989640dc300fe2bc7d5228296a4ac4b (patch) | |
| tree | 1a879bdfefa8a636bfc1f0e4a6f1bc4de6bfe05e /macosx/tkMacOSXInt.h | |
| parent | 132f2dd82aa35a0ceb92fb4db6c0a4d5f3e46d53 (diff) | |
| download | tk-eb472aefb989640dc300fe2bc7d5228296a4ac4b.zip tk-eb472aefb989640dc300fe2bc7d5228296a4ac4b.tar.gz tk-eb472aefb989640dc300fe2bc7d5228296a4ac4b.tar.bz2 | |
* macosx/tkMacOSX.h: Cleaned up & rationalized order of
* macosx/tkMacOSXBitmap.c: #includes of tk and carbon headers;
* macosx/tkMacOSXButton.c: sync whitespace, comments & minor
* macosx/tkMacOSXCarbonEvents.c: changes with HEAD.
* macosx/tkMacOSXClipboard.c:
* macosx/tkMacOSXColor.c:
* macosx/tkMacOSXConfig.c:
* macosx/tkMacOSXCursor.c:
* macosx/tkMacOSXDialog.c:
* macosx/tkMacOSXDraw.c:
* macosx/tkMacOSXEmbed.c:
* macosx/tkMacOSXEntry.c:
* macosx/tkMacOSXEvent.c:
* macosx/tkMacOSXEvent.h:
* macosx/tkMacOSXFont.c:
* macosx/tkMacOSXFont.h (new file):
* macosx/tkMacOSXHLEvents.c:
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXKeyEvent.c:
* macosx/tkMacOSXKeyboard.c:
* macosx/tkMacOSXMenu.c:
* macosx/tkMacOSXMenubutton.c:
* macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXMouseEvent.c:
* macosx/tkMacOSXNotify.c:
* macosx/tkMacOSXRegion.c:
* macosx/tkMacOSXScale.c:
* macosx/tkMacOSXScrlbr.c:
* macosx/tkMacOSXSend.c:
* macosx/tkMacOSXSubwindows.c:
* macosx/tkMacOSXTest.c:
* macosx/tkMacOSXWindowEvent.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXWm.h:
* macosx/tkMacOSXXStubs.c:
Diffstat (limited to 'macosx/tkMacOSXInt.h')
| -rw-r--r-- | macosx/tkMacOSXInt.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h index 236cec6..4118fb7 100644 --- a/macosx/tkMacOSXInt.h +++ b/macosx/tkMacOSXInt.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.8 2005/12/08 05:04:35 das Exp $ + * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.9 2006/03/28 02:44:13 das Exp $ */ #ifndef _TKMACINT @@ -19,6 +19,10 @@ #include "tkInt.h" #endif +#define TextStyle MacTextStyle +#include <Carbon/Carbon.h> +#undef TextStyle + /* * Include platform specific public interfaces. */ @@ -27,12 +31,6 @@ #include "tkMacOSX.h" #endif -#ifndef _TKPORT -#include "tkPort.h" -#endif - -#include <Carbon/Carbon.h> - struct TkWindowPrivate { TkWindow *winPtr; /* Ptr to tk window or NULL if Pixmap */ CGrafPtr grafPtr; |