From: Ben Loftis <ben@harrisonconsoles.com>
Date: Thu, 15 Feb 2018 22:32:37 +0000 (-0600)
Subject: GTKOSX is not a valid check.  Use __APPLE__
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=5200885fb82cfe4644eceaafefea014129156f93;p=ardour.git

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 5689aa9044..0918e69538 100644
--- 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 f7693be56a..3a50c3f42a 100644
--- 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 2806d261e9..15bd13f529 100644
--- 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