[Summary] Removing hard coding of the piece of layout where menu_bar is resides (the code for MAC).

This commit is contained in:
Valeriy Kamyshniy 2014-09-15 17:40:58 +03:00
parent 02af44fee3
commit 448f8eb448

View file

@ -760,7 +760,6 @@ void
ARDOUR_UI::build_menu_bar () ARDOUR_UI::build_menu_bar ()
{ {
menu_bar = dynamic_cast<MenuBar*> (ActionManager::get_widget (X_("/Main"))); menu_bar = dynamic_cast<MenuBar*> (ActionManager::get_widget (X_("/Main")));
menu_bar->set_name ("MainMenuBar");
/* /*
* This is needed because this property does not get installed * This is needed because this property does not get installed
@ -772,7 +771,12 @@ ARDOUR_UI::build_menu_bar ()
// so use this instead ... // so use this instead ...
gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers"); gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers");
#ifndef TOP_MENUBAR
menu_bar->set_name ("MainMenuBar");
editor->get_h_box ("menu_bar_home").pack_start (*menu_bar, false, false); editor->get_h_box ("menu_bar_home").pack_start (*menu_bar, false, false);
#else
use_menubar_as_top_menubar ();
#endif
return; return;
} }