diff options
Diffstat (limited to 'gtk2_ardour/actions.cc')
| -rw-r--r-- | gtk2_ardour/actions.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index 04a4bf3b02..3e49dca266 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -9,7 +9,6 @@ using namespace std; using namespace Gtk; using namespace Glib; using namespace sigc; -using namespace ActionManager; vector<Glib::RefPtr<Gtk::Action> > ActionManager::session_sensitive_actions; vector<Glib::RefPtr<Gtk::Action> > ActionManager::region_list_selection_sensitive_actions; @@ -19,6 +18,8 @@ vector<Glib::RefPtr<Gtk::Action> > ActionManager::plugin_selection_sensitive_act vector<Glib::RefPtr<Gtk::Action> > ActionManager::range_sensitive_actions; vector<Glib::RefPtr<Gtk::Action> > ActionManager::jack_sensitive_actions; +namespace ActionManager { + static vector<Glib::RefPtr<UIManager> > ui_managers; void @@ -45,6 +46,17 @@ register_action (RefPtr<ActionGroup> group, string name, string label, slot<void return act; } +RefPtr<Action> +register_action (RefPtr<ActionGroup> group, string name, string label) +{ + RefPtr<Action> act; + + act = Action::create (name, label); + group->add (act); + + return act; +} + RefPtr<Action> register_radio_action (RefPtr<ActionGroup> group, RadioAction::Group rgroup, string name, string label, slot<void> sl, guint key, Gdk::ModifierType mods) @@ -87,17 +99,6 @@ register_toggle_action (RefPtr<ActionGroup> group, string name, string label, sl return act; } -RefPtr<Action> -register_action (RefPtr<ActionGroup> group, string name, string label) -{ - RefPtr<Action> act; - - act = Action::create (name, label); - group->add (act); - - return act; -} - bool lookup_entry (const Glib::ustring accel_path, Gtk::AccelKey& key) { GtkAccelKey gkey; |