summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui_ed.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-09-20 18:04:47 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-09-20 18:04:47 +0000
commit47e8a7ac4a307b25b0f79f078ac0015ae8680ede (patch)
tree276e5479bf0bdfc94bed000938ef1df63835e211 /gtk2_ardour/ardour_ui_ed.cc
parent59343255616fe7182a9fdd0e1b574f2c915e945d (diff)
changes for OSX/SAE
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2475 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_ed.cc')
-rw-r--r--gtk2_ardour/ardour_ui_ed.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 3026355012..a8124fde4f 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -756,19 +756,20 @@ ARDOUR_UI::build_menu_bar ()
#ifndef TOP_MENUBAR
menu_hbox.pack_start (*menu_bar, true, true);
+#else
+ use_menubar_as_top_menubar ();
#endif
if (!Profile->get_small_screen()) {
+#ifndef GTKOSX
+ // OSX provides its own wallclock, thank you very much
menu_hbox.pack_end (wall_clock_box, false, false, 2);
+#endif
menu_hbox.pack_end (disk_space_box, false, false, 4);
}
menu_hbox.pack_end (cpu_load_box, false, false, 4);
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);
}