summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordas <das>2006-05-16 07:37:17 (GMT)
committerdas <das>2006-05-16 07:37:17 (GMT)
commit47ca172c1b298865428bf1034f3156136fee89cb (patch)
tree9e995e8d12bf5a0a3056c90e7664f3ef15b90552 /macosx
parentf79ac60ef10788b761ef42fd0051273cc9fe67ef (diff)
downloadtk-47ca172c1b298865428bf1034f3156136fee89cb.zip
tk-47ca172c1b298865428bf1034f3156136fee89cb.tar.gz
tk-47ca172c1b298865428bf1034f3156136fee89cb.tar.bz2
fix building on Jaguar: move defines of newer OS constants to top, fix warnings
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXWm.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 4236540..b8fcd3f 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.34 2006/05/16 06:55:06 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.35 2006/05/16 07:37:17 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -21,6 +21,19 @@
#include "tkMacOSXWm.h"
#include "tkMacOSXEvent.h"
+/* Define constants only available on Mac OS X 10.3 or later */
+#if !defined(MAC_OS_X_VERSION_10_3) || \
+ (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+ #define kSimpleWindowClass 18
+ #define kWindowDoesNotCycleAttribute (1L << 15)
+#endif
+/* Define constants only available on Mac OS X 10.4 or later */
+#if !defined(MAC_OS_X_VERSION_10_4) || \
+ (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
+ #define kWindowNoTitleBarAttribute (1L << 9)
+ #define kWindowMetalNoContentSeparatorAttribute (1L << 11)
+#endif
+
/*
* This is a list of all of the toplevels that have been mapped so far. It is
* used by the menu code to inval windows that were damaged by menus, and will
@@ -875,7 +888,7 @@ Tcl_Obj *CONST objv[]; /* Argument objects. */
err = FSNewAlias(NULL, &ref, &alias);
if (err == noErr) {
err = SetWindowProxyAlias(macWindow, alias);
- DisposeHandle(alias);
+ DisposeHandle((Handle) alias);
}
#endif
}
@@ -1709,7 +1722,7 @@ Tcl_Obj *CONST objv[]; /* Argument objects. */
err = FSNewAlias(NULL, &ref, &alias);
if (err == noErr) {
err = SetWindowProxyAlias(macWindow, alias);
- DisposeHandle(alias);
+ DisposeHandle((Handle) alias);
}
#endif
} else {
@@ -4937,16 +4950,6 @@ TkMacOSXWinStyle(
char *strValue;
int intValue;
};
-#if !defined(MAC_OS_X_VERSION_10_3) || \
- (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
- #define kSimpleWindowClass 18
- #define kWindowDoesNotCycleAttribute (1L << 15)
-#endif
-#if !defined(MAC_OS_X_VERSION_10_4) || \
- (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
- #define kWindowNoTitleBarAttribute (1L << 9)
- #define kWindowMetalNoContentSeparatorAttribute (1L << 11)
-#endif
static CONST struct StrIntMap styleMap[] = {
{ "documentProc", documentProc },
{ "noGrowDocProc", documentProc },