Window Manager object should use global action map, since bindings are part of the...

diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index 9b21c61d16e9adbb7b5b223afe8758c8ad3e0850..dd65e956fac2d73e3e0e566205e25bdc4ae4c884 100644 (file)
--- 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;
        }

diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h
index da578fae949eb24b261bd3c279ba091817cf78ce..bc4baee18e3e89db369203cb8808411f2eb089d3 100644 (file)
--- 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<Gtk::ActionGroup> window_actions;
        Gtk::Window* current_transient_parent;
-       Gtkmm2ext::ActionMap window_action_map;
        
        Manager();
        ~Manager();