summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSX.h
diff options
context:
space:
mode:
authordas <das>2006-03-24 14:58:00 (GMT)
committerdas <das>2006-03-24 14:58:00 (GMT)
commit870bc114d9c7780cfe7af2f8f430c232602db6c8 (patch)
tree08e05421fec5d0674503f27d0f1901dea3ffec28 /macosx/tkMacOSX.h
parent489d54fcecc142a1feb7d87c793d721875294291 (diff)
downloadtk-870bc114d9c7780cfe7af2f8f430c232602db6c8.zip
tk-870bc114d9c7780cfe7af2f8f430c232602db6c8.tar.gz
tk-870bc114d9c7780cfe7af2f8f430c232602db6c8.tar.bz2
* generic/tkTextDisp.c: moved #ifdef MAC_OSX_TK code added by
* macosx/tkMacOSXColor.c: Patch #638966 into platform specific * macosx/tkMacOSXInt.h: files. * macosx/tkMacOSX.h: cleaned up & rationalized order of * macosx/tkMacOSXBitmap.c: #includes of tk and carbon headers. * macosx/tkMacOSXButton.c: * macosx/tkMacOSXCarbonEvents.c: * 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.h: * 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/tkMacOSXRegion.c: * macosx/tkMacOSXScale.c: * macosx/tkMacOSXScrlbr.c: * macosx/tkMacOSXSend.c: * macosx/tkMacOSXSubwindows.c: * macosx/tkMacOSXWindowEvent.c: * macosx/tkMacOSXWm.c: * macosx/tkMacOSXWm.h: * macosx/tkMacOSXXStubs.c:
Diffstat (limited to 'macosx/tkMacOSX.h')
-rw-r--r--macosx/tkMacOSX.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h
index 89e6641..1fb92f4 100644
--- a/macosx/tkMacOSX.h
+++ b/macosx/tkMacOSX.h
@@ -9,17 +9,18 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSX.h,v 1.3 2005/02/24 00:41:04 das Exp $
+ * RCS: @(#) $Id: tkMacOSX.h,v 1.4 2006/03/24 14:58:00 das Exp $
*/
#ifndef _TKMAC
#define _TKMAC
-#include <Carbon/Carbon.h>
#ifndef _TK
#include "tk.h"
#endif
+#include <Carbon/Carbon.h>
+
/*
* Structures and function types for handling Netscape-type in process
* embedding where Tk does not control the top-level