GTKOSX is not a valid check. Use __APPLE__

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 5689aa904470d7563bd7382b6b07e96f97cd5d19..0918e69538b386fe8c485ca96997ea579bdec310 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -132,7 +132,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 gint
 ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
 {
-#ifdef GTKOSX
+#ifdef __APPLE__
        /* just hide the window, and return - the top menu stays up */
        editor->hide ();
        return TRUE;

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index f7693be56a78632031889627dd953b9ba0a44e23..3a50c3f42a8f645bcebf777f49f47608a2efa78f 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -700,7 +700,7 @@ ARDOUR_UI::build_menu_bar ()
        format_label.set_name ("Format");
        format_label.set_use_markup ();
 
-#ifdef GTKOSX
+#ifdef __APPLE__
        use_menubar_as_top_menubar ();
 #else
        menu_hbox.pack_start (*menu_bar, false, false);

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 2806d261e9128c19c87da9e51bd489871d329ab6..15bd13f5295bf3898528c41381e62e747e11f527 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -224,8 +224,8 @@ static const gchar *_rb_opt_strings[] = {
 #endif
 
 //Robin says: this should be odd to accomodate cairo drawing offset ( width/2 rounds up to pixel boundary )
-#ifdef GTKOSX
-#define COMBO_TRIANGLE_WIDTH 25 // ArdourButton _diameter (11) + 2 * arrow-padding (2*2) + 2 * text-padding (2*5)
+#ifdef __APPLE__
+#define COMBO_TRIANGLE_WIDTH 19 // ArdourButton _diameter (11) + 2 * arrow-padding (2*2) + 2 * text-padding (2*5)
 #else
 #define COMBO_TRIANGLE_WIDTH 11 // as-measured for win/linux.
 #endif