summaryrefslogtreecommitdiff
path: root/gtk2_ardour/actions.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2005-11-17 21:31:37 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2005-11-17 21:31:37 +0000
commitcdc2d055f1ede3d9565dbf2b2d1abbf87a1f622c (patch)
tree2523a3b351add1113224052612864327f526929e /gtk2_ardour/actions.h
parent5d515004903f75d8c18328c0bdb84008ae5bfe23 (diff)
more fixes on the long road to compiling
git-svn-id: svn://localhost/trunk/ardour2@103 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/actions.h')
-rw-r--r--gtk2_ardour/actions.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h
index d36b8b07f4..e0d7fa020f 100644
--- a/gtk2_ardour/actions.h
+++ b/gtk2_ardour/actions.h
@@ -21,6 +21,8 @@ namespace ActionManager
extern std::vector<Glib::RefPtr<Gtk::Action> > range_sensitive_actions;
extern std::vector<Glib::RefPtr<Gtk::Action> > jack_sensitive_actions;
+ extern std::string unbound_string; /* the key string returned if an action is not bound */
+
void register_ui_manager (Glib::RefPtr<Gtk::UIManager>);
Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group,
@@ -42,6 +44,9 @@ namespace ActionManager
guint key, Gdk::ModifierType mods);
Glib::RefPtr<Gtk::Action> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group,
std::string name, std::string label, sigc::slot<void> sl);
+
+ void merge_actions (Glib::RefPtr<Gtk::ActionGroup> dst, const Glib::RefPtr<Gtk::ActionGroup> src);
+
};
#endif /* __ardour_gtk_actions_h__ */