X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=gtk2_ardour%2Fwindow_manager.cc;h=4c68ff411a7c030225fb1c2231024f0218f4af83;hp=d66efa24942178386f0120f8ae9620fa8b7b7b20;hb=fc83d044f85872e55d7da02ff2a4bb6f8725714f;hpb=00df619d2184ad6d46eda1b0964b7ac4ed2bffcd

diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index d66efa2494..4c68ff411a 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 = ARDOUR_UI::instance()->action_map().create_action_group (X_("Window"));
+			window_actions = ActionManager::create_action_group (X_("Window"));
 		}
 
-		ARDOUR_UI::instance()->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));
+		ActionManager::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->signal_map.connect (sigc::bind (sigc::mem_fun (*this, &Manager::window_proxy_was_mapped), info));
 		info->signal_unmap.connect (sigc::bind (sigc::mem_fun (*this, &Manager::window_proxy_was_unmapped), info));
@@ -82,7 +82,7 @@ Manager::register_window (ProxyBase* info)
 void
 Manager::window_proxy_was_mapped (ProxyBase* proxy)
 {
-	Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+	Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
 	if (!act) {
 		return;
 	}
@@ -97,7 +97,7 @@ Manager::window_proxy_was_mapped (ProxyBase* proxy)
 void
 Manager::window_proxy_was_unmapped (ProxyBase* proxy)
 {
-	Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+	Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
 	if (!act) {
 		return;
 	}
@@ -123,7 +123,7 @@ Manager::remove (const ProxyBase* info)
 void
 Manager::toggle_window (ProxyBase* proxy)
 {
-	Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+	Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
 	if (!act) {
 		return;
 	}