diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-08-15 13:38:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-08-15 13:38:23 +0000 |
| commit | a4c84de53c3855b52955df5633e2b1a4347667f8 (patch) | |
| tree | 760d1a67e3c35154e987ecd171696b2b7a4c942d /gtk2_ardour/ardour_ui_ed.cc | |
| parent | a8fc5f180de26ddfbc94687739fbad84a66b711c (diff) | |
changes specific to GTK-OSX build
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2303 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_ed.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index c04608825e..602fe260ea 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -37,6 +37,7 @@ #include "engine_dialog.h" #include "editor.h" #include "actions.h" +#include "sync-menu.h" #include <ardour/session.h> #include <ardour/profile.h> @@ -735,7 +736,9 @@ ARDOUR_UI::build_menu_bar () sample_rate_box.set_name ("SampleRate"); sample_rate_label.set_name ("SampleRate"); +#ifndef TOP_MENUBAR menu_hbox.pack_start (*menu_bar, true, true); +#endif if (!Profile->get_small_screen()) { menu_hbox.pack_end (wall_clock_box, false, false, 2); menu_hbox.pack_end (disk_space_box, false, false, 4); @@ -744,11 +747,23 @@ ARDOUR_UI::build_menu_bar () menu_hbox.pack_end (buffer_load_box, false, false, 4); menu_hbox.pack_end (sample_rate_box, false, false, 4); +#ifdef TOP_MENUBAR + use_menubar_as_top_menubar (); +#endif + menu_bar_base.set_name ("MainMenuBar"); menu_bar_base.add (menu_hbox); } void +ARDOUR_UI::use_menubar_as_top_menubar () +{ +#ifdef GTKOSX + sync_menu_takeover_menu ((GtkMenuShell*) menu_bar->gobj()); +#endif +} + +void ARDOUR_UI::setup_clock () { ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false)); |