From 915325bdef2cbe94f0474d11552d07187f23163a Mon Sep 17 00:00:00 2001
From: das <das>
Date: Tue, 16 May 2006 07:37:21 +0000
Subject: fix building on Jaguar: move defines of newer OS constants to top,
 fix warnings

---
 macosx/tkMacOSXWm.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 0c7190b..28bda54 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.7.2.26 2006/05/16 06:55:14 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.27 2006/05/16 07:37:21 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
@@ -860,7 +873,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
 		    }
@@ -1625,7 +1638,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 {
@@ -4843,16 +4856,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	  },
-- 
cgit v0.12