additional GTKOSX => __APPLE__ changes missed in previous commit

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index d0d75d52eb4b3128c3f6eaaf09be1c5c9c825ef8..16634f800e3d5a3f1789d609048a625b3a48b25b 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -43,12 +43,12 @@
       </menu>
       <separator/>
       <menuitem action='toggle-session-options-editor'/>
-#ifdef GTKOSX      
+#ifdef __APPLE__
       <menuitem action='toggle-about'/>
 #endif
       <separator/>
       <menuitem action='lock'/>
-#ifndef GTKOSX
+#ifndef __APPLE__
       <separator/>
       <menuitem action='Quit'/>
 #endif
@@ -550,7 +550,7 @@
       <separator/>
     </menu>
     <menu name='Help' action='Help'>
-#ifndef GTKOSX
+#ifndef __APPLE__
       <menuitem action='toggle-about'/>
 #endif
       <menuitem action='chat'/>

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 92ea7ee1bc2c4f531f8d1385071927133d5a39d1..ba1a829a6fb0f98e664907cd17ba014847e95110 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -659,8 +659,8 @@ def build(bld):
 
     # Menus
     menus_argv = []
-    if bld.is_defined('GTKOSX'):
-        menus_argv = [ '-E', '-P', '-DGTKOSX', '-' ]
+    if sys.platform == 'darwin':
+        menus_argv = [ '-E', '-P', '-D__APPLE__', '-' ]
     else:
         menus_argv = [ '-E', '-P' ]
 

diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 41d9f668e2308e77a1923f847e6a39d7f9affb05..690ea024cf70c3480e8836570482afb38bb20355 100644 (file)
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -57,7 +57,7 @@ guint Keyboard::delete_mod = GDK_SHIFT_MASK;
 guint Keyboard::insert_note_but = 1;
 guint Keyboard::insert_note_mod = GDK_CONTROL_MASK;
 
-#ifdef GTKOSX
+#ifdef __APPLE__
 
 uint Keyboard::PrimaryModifier = GDK_META_MASK|GDK_MOD2_MASK;   // Command
 guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control
@@ -591,7 +591,7 @@ Keyboard::is_insert_note_event (GdkEventButton *ev)
 bool
 Keyboard::is_button2_event (GdkEventButton* ev)
 {
-#ifdef GTKOSX
+#ifdef __APPLE__
        return (ev->button == 2) ||
                ((ev->button == 1) &&
                 ((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifiers));

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 0640f58d51251683430066690a153792cda10f5f..59d9c3524368badd1a80c0c8fd2a2e6baf37815b 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -2,6 +2,8 @@
 from waflib.extras import autowaf as autowaf
 from waflib import Options
 import os
+import sys
+import platform as PLATFORM
 
 # Version of this package (even if built as a child)
 MAJOR = '0'
@@ -105,7 +107,7 @@ def build(bld):
     obj.includes     = ['.']
     obj.name         = 'libgtkmm2ext'
     obj.target       = 'gtkmm2ext'
-    obj.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
+    obj.uselib       = 'GTKMM GTK'
     obj.use          = [ 'libpbd', 'libardour' ]
     obj.vnum         = GTKMM2EXT_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']
@@ -113,7 +115,7 @@ def build(bld):
                     'PACKAGE="' + I18N_PACKAGE + '"',
                     'LOCALEDIR="' + os.path.join(
                             os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
-    if bld.is_defined('GTKOSX'):
+    if sys.platform == 'darwin':
         obj.source += ['gtkapplication_quartz.mm']
     else:
         obj.source += ['gtkapplication_x11.c']

diff --git a/wscript b/wscript
index c0c70377c2049c3cf55fe6ce5c233353ade8071f..eae6aee8e02872451540f4f960541d178951dad8 100644 (file)
--- a/wscript
+++ b/wscript
@@ -846,7 +846,7 @@ def configure(conf):
         conf.define ('HAVE_COREAUDIO', 1)
         conf.define ('AUDIOUNIT_SUPPORT', 1)
 
-        conf.define ('TOP_MENUBAR',1)
+        Conf.define ('TOP_MENUBAR',1)
 
         # It would be nice to be able to use this to force back-compatibility with 10.4
         # but even by the time of 11, the 10.4 SDK is no longer available in any normal