summaryrefslogtreecommitdiff
path: root/gtk2_ardour/window_manager.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-09-01 13:51:59 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-02-22 15:31:24 -0500
commit75e671b8674047900bd3c8b0bcbe9e4b97b26eb0 (patch)
tree7529925a8f3295d93e4c74ddf89a79c1fed10823 /gtk2_ardour/window_manager.cc
parentf6721344bd6f6c7701e221b218a82cfbcefc4e3e (diff)
Window Manager object should use global action map, since bindings are part of the global set
Diffstat (limited to 'gtk2_ardour/window_manager.cc')
-rw-r--r--gtk2_ardour/window_manager.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index 9b21c61d16..dd65e956fa 100644
--- a/gtk2_ardour/window_manager.cc
+++ b/gtk2_ardour/window_manager.cc
@@ -66,12 +66,12 @@ Manager::register_window (ProxyBase* info)
if (!info->menu_name().empty()) {
if (!window_actions) {
- window_actions = window_action_map.create_action_group (X_("Window"));
+ window_actions = ARDOUR_UI::instance()->global_actions.create_action_group (X_("Window"));
}
- info->set_action (window_action_map.register_toggle_action (window_actions,
- info->action_name().c_str(), info->menu_name().c_str(),
- sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)));
+ info->set_action (ARDOUR_UI::instance()->global_actions.register_toggle_action (window_actions,
+ info->action_name().c_str(), info->menu_name().c_str(),
+ sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)));
}
}
@@ -90,7 +90,7 @@ void
Manager::toggle_window (ProxyBase* proxy)
{
- Glib::RefPtr<Gtk::Action> act = window_action_map.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+ Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
if (!act) {
return;
}