smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

GTKOSX is not a valid check. Use __APPLE__

Browse source
This commit is contained in:
Ben Loftis 2018-02-15 16:32:37 -06:00
parent f54f270627
commit 5200885fb8
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -132,7 +132,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
gint gint
ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/) ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/)
{ {
#ifdef GTKOSX #ifdef __APPLE__
/* just hide the window, and return - the top menu stays up */ /* just hide the window, and return - the top menu stays up */
editor->hide (); editor->hide ();
return TRUE; return TRUE;

2
gtk2_ardour/ardour_ui_ed.cc
View file

@ -700,7 +700,7 @@ ARDOUR_UI::build_menu_bar ()
format_label.set_name ("Format"); format_label.set_name ("Format");
format_label.set_use_markup (); format_label.set_use_markup ();
#ifdef GTKOSX #ifdef __APPLE__
use_menubar_as_top_menubar (); use_menubar_as_top_menubar ();
#else #else
menu_hbox.pack_start (*menu_bar, false, false); menu_hbox.pack_start (*menu_bar, false, false);

4
gtk2_ardour/editor.cc
View file

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