ardour/livetrax
13
0
Fork 0
Code

use new action map API instead of ActionManager::get_action

Browse Source
This commit is contained in:
Paul Davis 2018-12-07 16:07:13 -05:00
parent a68766ec53
commit efd75b7152
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/window_manager.cc
View File

@ -66,10 +66,10 @@ Manager::register_window (ProxyBase* info)
if (!info->menu_name().empty()) { if (!info->menu_name().empty()) {
if (!window_actions) { if (!window_actions) {
window_actions = ARDOUR_UI::instance()->global_actions.create_action_group (X_("Window")); window_actions = ARDOUR_UI::instance()->action_map().create_action_group (X_("Window"));
} }
ARDOUR_UI::instance()->global_actions.register_toggle_action (window_actions, ARDOUR_UI::instance()->action_map().register_toggle_action (window_actions,
info->action_name().c_str(), info->menu_name().c_str(), info->action_name().c_str(), info->menu_name().c_str(),
sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)); sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info));
@ -82,7 +82,7 @@ Manager::register_window (ProxyBase* info)
void void
Manager::window_proxy_was_mapped (ProxyBase* proxy) Manager::window_proxy_was_mapped (ProxyBase* proxy)
{ {
Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name())); Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
if (!act) { if (!act) {
return; return;
} }
@ -97,7 +97,7 @@ Manager::window_proxy_was_mapped (ProxyBase* proxy)
void void
Manager::window_proxy_was_unmapped (ProxyBase* proxy) Manager::window_proxy_was_unmapped (ProxyBase* proxy)
{ {
Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name())); Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
if (!act) { if (!act) {
return; return;
} }
@ -123,7 +123,7 @@ Manager::remove (const ProxyBase* info)
void void
Manager::toggle_window (ProxyBase* proxy) Manager::toggle_window (ProxyBase* proxy)
{ {
Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name())); Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
if (!act) { if (!act) {
return; return;
} }