smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 17:03:06 +01:00
Code Issues Projects Releases Wiki Activity

some changes for top menubar systems (i.e. OS X)

Browse source
This commit is contained in:
Paul Davis 2015-07-16 15:56:32 -04:00
parent 1158271f72
commit 558167a5dd
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/ardour_ui2.cc
View file

@ -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

9
gtk2_ardour/public_editor.h
View file

@ -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;