diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2018-02-14 15:42:36 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2018-02-17 09:12:03 -0600 |
| commit | 5c741bf8c5486de7e62269cd426d3c31cac6b77b (patch) | |
| tree | 0d82629be78695346bdc958595391d150303fc88 /gtk2_ardour/ardour_ui_dependents.cc | |
| parent | 97fb3a5557b56c3ea7e839c0c9754d45e4d357b5 (diff) | |
MacOS: Move status info to top, just like win+linux. (but no menu up there of course.)
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index ede0071acd..5689aa9044 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -132,7 +132,7 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s) gint ARDOUR_UI::exit_on_main_window_close (GdkEventAny * /*ev*/) { -#ifdef TOP_MENUBAR +#ifdef GTKOSX /* just hide the window, and return - the top menu stays up */ editor->hide (); return TRUE; @@ -276,25 +276,7 @@ ARDOUR_UI::setup_windows () we_have_dependents (); -#ifdef TOP_MENUBAR - EventBox* status_bar_event_box = manage (new EventBox); - - status_bar_event_box->add (status_bar_label); - status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - status_bar_label.set_size_request (300, -1); - status_bar_label.set_ellipsize (Pango::ELLIPSIZE_END); - status_bar_label.set_single_line_mode (true); - - status_bar_label.show (); - status_bar_event_box->show (); - - status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press)); - - status_bar_hpacker.pack_start (*status_bar_event_box, true, true, 6); - status_bar_hpacker.pack_start (menu_bar_base, false, false, 2); -#else top_packer.pack_start (menu_bar_base, false, false); -#endif main_vpacker.pack_start (top_packer, false, false); @@ -303,10 +285,6 @@ ARDOUR_UI::setup_windows () main_vpacker.pack_start (transport_frame, false, false); main_vpacker.pack_start (_tabs, true, true); -#ifdef TOP_MENUBAR - main_vpacker.pack_start (status_bar_hpacker, false, false); -#endif - LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_action_script_btn)); for (int i = 0; i < 9; ++i) { |