diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-08-08 08:36:29 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
| commit | 67e19c177f473807cd6510751bcf4a48574e6088 (patch) | |
| tree | f44cf815264162afd9d0d4f06c938c4be6cfb06a /gtk2_ardour/window_manager.cc | |
| parent | 29b69b0ab4e92b49e171bfeb68af58da43ae766b (diff) | |
radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from binding definition
We need this because we need binding information/objects before all
Actions have been defined.
Diffstat (limited to 'gtk2_ardour/window_manager.cc')
| -rw-r--r-- | gtk2_ardour/window_manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc index eadfc196c3..eda2943648 100644 --- a/gtk2_ardour/window_manager.cc +++ b/gtk2_ardour/window_manager.cc @@ -22,6 +22,7 @@ #include "ardour/session_handle.h" +#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/visibility_tracker.h" #include "actions.h" @@ -65,13 +66,12 @@ Manager::register_window (ProxyBase* info) if (!info->menu_name().empty()) { if (!window_actions) { - window_actions = ARDOUR_UI::instance()->global_actions.create_action_group (X_("Window")); - ARDOUR_UI::instance()->global_actions.install_action_group (window_actions); + window_actions = Gtkmm2ext::Actions.create_action_group (X_("Window")); } - 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))); + info->set_action (Gtkmm2ext::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 = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name())); + Glib::RefPtr<Gtk::Action> act = Gtkmm2ext::Actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name())); if (!act) { return; } |