From 1bcf46cb3f198f07466a28b2ca4b8d7a54c41b72 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Sun, 27 Nov 2005 06:37:31 +0000
Subject: 	* macosx/tkMacOSXMenu.c: 	* macosx/tkMacOSXMenubutton.c:
 define OSX 10.3 or later only constants 	if necessary to allow
 compilation on OSX 10.2

---
 ChangeLog                   | 2 ++
 macosx/tkMacOSXMenu.c       | 8 +++++++-
 macosx/tkMacOSXMenubutton.c | 8 +++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1eda373..7d40913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,8 @@
 	* macosx/tkMacOSXMenus.c (TkMacOSXHandleMenuSelect): switch to  modern
 	utf8 aware menu manager API, remove obsolete code, add error handling.
 
+	* macosx/tkMacOSXMenu.c:
+	* macosx/tkMacOSXMenubutton.c:
 	* macosx/tkMacOSXMouseEvent.c: define OSX 10.3 or later only constants
 	if necessary to allow compilation on OSX 10.2
 
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 138d741..9b11c88 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -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: tkMacOSXMenu.c,v 1.21 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.22 2005/11/27 06:37:31 das Exp $
  */
 #include "tkMacOSXInt.h"
 #include "tkMenubutton.h"
@@ -18,6 +18,12 @@
 #include "tkMacOSXInt.h"
 #undef Status
 
+#if !defined(MAC_OS_X_VERSION_10_3) || \
+        (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+    /* Define constants only available on Mac OS X 10.3 or later */
+    #define kMenuAttrDoNotUseUserCommandKeys = (1 << 7)
+#endif
+
 #define USE_TK_MDEF
 //#define USE_ATSU
 
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index f238768..97284b9 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.6 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.7 2005/11/27 06:37:31 das Exp $
  */
 
 #include <Carbon/Carbon.h>
@@ -19,6 +19,12 @@
 #include "tkMacOSXInt.h"
 #include "tkMacOSXDebug.h"
 
+#if !defined(MAC_OS_X_VERSION_10_3) || \
+        (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
+    /* Define constants only available on Mac OS X 10.3 or later */
+    #define kMenuAttrDoNotUseUserCommandKeys = (1 << 7)
+#endif
+
 #define kShadowOffset   (3)     /* amount to offset shadow from frame */
 #define kTriangleWidth  (11)    /* width of the triangle */
 #define kTriangleHeight (6)     /* height of the triangle */
-- 
cgit v0.12