summaryrefslogtreecommitdiffstats
path: root/mac/tkMacInt.h
diff options
context:
space:
mode:
authordas <das>2001-11-23 02:04:08 (GMT)
committerdas <das>2001-11-23 02:04:08 (GMT)
commitaa409cc42da819e8ab1d081e7a1f175b33c1c2cf (patch)
tree0d0864ac4fc0b0ff178f5869f1600d2c584109c8 /mac/tkMacInt.h
parent5efa25f6e1ad2a687cac8c1caab6d8c10f978269 (diff)
downloadtk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.zip
tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.tar.gz
tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.tar.bz2
** upport to 8.4 of mac code changes for 8.3.3 & various new
** changes for 8.4, some already backported to 8.3.4 (patch #435660) see ChangeLog for details
Diffstat (limited to 'mac/tkMacInt.h')
-rw-r--r--mac/tkMacInt.h28
1 files changed, 24 insertions, 4 deletions
diff --git a/mac/tkMacInt.h b/mac/tkMacInt.h
index 3a96f15..ecb97ae 100644
--- a/mac/tkMacInt.h
+++ b/mac/tkMacInt.h
@@ -8,15 +8,27 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacInt.h,v 1.9 2000/02/10 08:55:18 jingham Exp $
+ * RCS: @(#) $Id: tkMacInt.h,v 1.10 2001/11/23 02:05:55 das Exp $
*/
#ifndef _TKMACINT
#define _TKMACINT
+#ifndef _TKINT
#include "tkInt.h"
+#endif
+
+/*
+ * Include platform specific public interfaces.
+ */
+#ifndef _TKMAC
#include "tkMac.h"
+#endif
+
+#ifndef _TKPORT
+#include "tkPort.h"
+#endif
#include <AppleEvents.h>
#include <Windows.h>
@@ -73,7 +85,7 @@ typedef struct TkMacWindowList {
* embedding where Tk does not control the top-level. It contains
* various functions that are needed by Mac specific routines, like
* TkMacGetDrawablePort. The definitions of the function types
- * are in tclMac.h.
+ * are in tkMac.h.
*/
typedef struct {
@@ -206,8 +218,16 @@ typedef TkMenuDefProcPtr TkMenuDefUPP;
#include "tkIntPlatDecls.h"
-/* FIXME - This has to go in the tkInt.decls!!! */
+#ifdef BUILD_tk
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+#endif
+
+/*
+ * mac specific procedures exported from the DLL
+ */
-int TkpIsWindowFloating _ANSI_ARGS_((WindowRef window));
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
#endif /* _TKMACINT */