From 558167a5dd503363d87f55ebaabca8bd3062a282 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 16 Jul 2015 15:56:32 -0400 Subject: [PATCH] some changes for top menubar systems (i.e. OS X) --- gtk2_ardour/ardour_ui2.cc | 5 ++--- gtk2_ardour/public_editor.h | 9 --------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index b7ec0ed0e9..ab6413f464 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -102,7 +102,6 @@ ARDOUR_UI::setup_windows () we_have_dependents (); #ifdef TOP_MENUBAR - HBox* status_bar_packer = manage (new HBox); EventBox* status_bar_event_box = manage (new EventBox); status_bar_event_box->add (status_bar_label); @@ -116,8 +115,8 @@ ARDOUR_UI::setup_windows () status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press)); - editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true); - editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 2); + status_bar_hpacker.pack_start (*status_bar_packer, true, true); + status_bar_hpacker.pack_start (menu_bar_base, false, false, 2); #else top_packer.pack_start (menu_bar_base, false, false); #endif diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index f119cca747..8736ea4b61 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -362,15 +362,6 @@ class PublicEditor : public Gtkmm2ext::Tabbable { static const int vertical_spacing; static const int horizontal_spacing; -#ifdef TOP_MENUBAR - /* - * This is needed for OS X primarily - * but also any other OS that uses a single - * top menubar instead of per window menus - */ - virtual Gtk::HBox& get_status_bar_packer() = 0; -#endif - virtual ArdourCanvas::Container* get_trackview_group () const = 0; virtual ArdourCanvas::ScrollGroup* get_hscroll_group () const = 0; virtual ArdourCanvas::ScrollGroup* get_hvscroll_group () const = 0;