diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-20 22:36:35 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-20 22:36:35 +0000 |
commit | b2bf4eee3d9ca63a34415c75e877b8c97d6b5f13 (patch) | |
tree | c2e3aeec94abfbbd976609bd50559c7a5aca9640 /gtk2_ardour/ardour_ui_ed.cc | |
parent | c2e491b8fcadba0da7ab8415a6357cfba88a431d (diff) |
2.X commits up to and including 7519
git-svn-id: svn://localhost/ardour2/branches/3.0@7661 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_ed.cc')
-rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index a0d5330e6e..4f1f980751 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -552,7 +552,26 @@ ARDOUR_UI::build_menu_bar () void ARDOUR_UI::use_menubar_as_top_menubar () { - gtk_application_set_menu_bar ((GtkMenuShell*) menu_bar->gobj()); + Gtk::Widget* widget; + Application* app = Application::instance (); + + /* Quit will be taken of separately */ + + if ((widget = ActionManager::get_widget ("/ui/Main/Session/Quit"))) { + widget->hide (); + } + + GtkApplicationMenuGroup* group = app->add_app_menu_group (); + + if ((widget = ActionManager::get_widget ("/ui/Main/Help/About"))) { + app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget)); + } + + if ((widget = ActionManager::get_widget ("/ui/Main/WindowMenu/ToggleOptionsEditor"))) { + app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget)); + } + + app->set_menu_bar (*menu_bar); } void |