From c74cc400ab2d9838a5a39b9b39101e005bf97f47 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Sun, 27 Nov 2005 06:53:36 +0000
Subject: * macosx/tkMacOSXMenu.c: * macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXMenubutton.c: define OSX 10.3 or later only constants
if necessary to allow compilation on OSX 10.2
---
ChangeLog | 1 +
macosx/tkMacOSXMenu.c | 14 +++++++-------
macosx/tkMacOSXMenus.c | 8 +++++++-
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 42d2173..26ad083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@
utf8 aware menu manager API, remove obsolete code, add error handling.
* macosx/tkMacOSXMenu.c:
+ * macosx/tkMacOSXMenus.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 9b3c9a6..275846d 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.13 2005/11/27 06:47:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.14 2005/11/27 06:53:36 das Exp $
*/
#include "tkMacOSXInt.h"
#include "tkMenubutton.h"
@@ -18,12 +18,6 @@
#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
@@ -31,6 +25,12 @@
#include "tkMacOSXDebug.h"
#include <CoreFoundation/CFString.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
+
typedef struct MacMenu {
MenuRef menuHdl; /* The Menu Manager data structure. */
Rect menuRect; /* The rectangle as calculated in the
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 1531d2b..c214105 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.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: tkMacOSXMenus.c,v 1.2.2.5 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.2.2.6 2005/11/27 06:53:36 das Exp $
*/
#include "tk.h"
@@ -24,6 +24,12 @@
#undef Status
#include <Carbon/Carbon.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 kAppleMenu 256
#define kAppleAboutItem 1
#define kFileMenu 2
--
cgit v0.12