From 75e671b8674047900bd3c8b0bcbe9e4b97b26eb0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 1 Sep 2015 13:51:59 -0400 Subject: [PATCH] Window Manager object should use global action map, since bindings are part of the global set --- gtk2_ardour/window_manager.cc | 10 +++++----- gtk2_ardour/window_manager.h | 1 - 2 files changed, 5 insertions(+), 6 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 act = window_action_map.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name())); + Glib::RefPtr act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name())); if (!act) { return; } diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h index da578fae94..bc4baee18e 100644 --- a/gtk2_ardour/window_manager.h +++ b/gtk2_ardour/window_manager.h @@ -71,7 +71,6 @@ class Manager : public ARDOUR::SessionHandlePtr Windows _windows; Glib::RefPtr window_actions; Gtk::Window* current_transient_parent; - Gtkmm2ext::ActionMap window_action_map; Manager(); ~Manager(); -- 2.30.2