diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 029011e717..b493482b40 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -564,8 +564,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr /* menu bar and associated stuff */ Gtk::MenuBar* menu_bar; - Gtk::EventBox menu_bar_base; - Gtk::HBox menu_hbox; void use_menubar_as_top_menubar (); void build_menu_bar (); diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 3f03e5f704..0ac819de40 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -88,9 +88,6 @@ ARDOUR_UI::setup_windows () we_have_dependents (); -#ifndef TOP_MENUBAR - editor->get_h_box ("menu_bar_base").pack_start (menu_bar_base, false, false); -#endif if (ARDOUR::Profile->get_trx()) { top_packer.pack_start (tracks_tools_packer, false, false); } else { diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 603454f8b5..f26ca005d1 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -772,29 +772,8 @@ ARDOUR_UI::build_menu_bar () // so use this instead ... gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers"); - EventBox* ev = manage (new EventBox); - ev->show (); - CairoHPacker* hbox = manage (new CairoHPacker); - hbox->set_name (X_("StatusBarBox")); - hbox->show (); - hbox->set_border_width (3); - - VBox* vbox = manage (new VBox); - vbox->pack_start (*hbox, true, false); - vbox->show(); - - ev->add (*vbox); - -#ifndef TOP_MENUBAR - menu_hbox.pack_start (*menu_bar, false, false); -#else - use_menubar_as_top_menubar (); -#endif - -// menu_hbox.pack_end (*ev, false, false, 6); - - menu_bar_base.set_name ("MainMenuBar"); - menu_bar_base.add (menu_hbox); + editor->get_h_box ("menu_bar_home").pack_start (*menu_bar, false, false); + return; } void diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml index ce3d73fbea..92f255dbcc 100644 --- a/gtk2_ardour/ui/editor_window.xml +++ b/gtk2_ardour/ui/editor_window.xml @@ -38,9 +38,7 @@ maxvalue="10" step="0.2" pagesize="2.0"/> - - - +