diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-15 01:59:56 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-15 01:59:56 +0000 |
| commit | 15bb3b577ec9a8cb50758c4b017718e342a2439c (patch) | |
| tree | 293407ebe738cfc3378335a82cb69e75751e9e73 /gtk2_ardour/ardour_ui_ed.cc | |
| parent | 496a2da48f8a02a4be7761f0da6eb0b3828ee68b (diff) | |
rework "ige_mac" menubar integration from Carbon to Cocoa; recast as start of GtkApplication object as per discussions on #gtk+; associated changes in ardour; NOT TESTED ON X11, LEOPARD or SNOW LEOPARD
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6493 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_ed.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index fc0fddbb8d..b795bc5ae8 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -41,9 +41,7 @@ #include "mixer_ui.h" #include "utils.h" -#ifdef GTKOSX -#include <gtkmm2ext/sync-menu.h> -#endif +#include <gtkmm2ext/gtkapplication.h> #include <ardour/session.h> #include <ardour/profile.h> @@ -854,7 +852,7 @@ void ARDOUR_UI::use_menubar_as_top_menubar () { #ifdef GTKOSX - ige_mac_menu_set_menu_bar ((GtkMenuShell*) menu_bar->gobj()); + gtk_application_set_menu_bar ((GtkMenuShell*) menu_bar->gobj()); // ige_mac_menu_set_quit_menu_item (some_item->gobj()); #endif } |