summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-11-27 06:37:58 (GMT)
committerdas <das>2005-11-27 06:37:58 (GMT)
commit6bd2d5a02e5e58b7bd679f7412f19d9267b11aa1 (patch)
treef807098ecf0b332836f0f2cfb0e4463cd7d11443
parenta9206527ba1b3b98d41714dcf7564cdba3cbf8f7 (diff)
downloadtk-6bd2d5a02e5e58b7bd679f7412f19d9267b11aa1.zip
tk-6bd2d5a02e5e58b7bd679f7412f19d9267b11aa1.tar.gz
tk-6bd2d5a02e5e58b7bd679f7412f19d9267b11aa1.tar.bz2
* macosx/tkMacOSXMenu.c:
* macosx/tkMacOSXMenubutton.c: define OSX 10.3 or later only constants if necessary to allow compilation on OSX 10.2
-rw-r--r--ChangeLog2
-rw-r--r--macosx/tkMacOSXMenu.c8
-rw-r--r--macosx/tkMacOSXMenubutton.c8
3 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bdbad91..42d2173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,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 022bd86..f2f9988 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.6.2.11 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.12 2005/11/27 06:37:58 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 cd5b44c..7fc7905 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.2.2.4 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.2.2.5 2005/11/27 06:37:59 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 */