Merge branch 'master' into windows

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / actions.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/actions.h b/libs/gtkmm2ext/gtkmm2ext/actions.h
index 5616bbb302f0a99f87b4d24b795ce75bcf0508cb..9101f8ea92b6c4e86a8fe07f2e5d539147ccee9e 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/actions.h
+++ b/libs/gtkmm2ext/gtkmm2ext/actions.h
@@ -43,6 +43,9 @@ namespace ActionManager {
        extern Gtk::Widget* get_widget (const char * name);
        extern Glib::RefPtr<Gtk::Action> get_action (const char* group, const char* name);
        extern Glib::RefPtr<Gtk::Action> get_action (const char* path);
+       extern Glib::RefPtr<Gtk::Action> get_action_from_name (const char* name);
+       extern void do_action (const char* group, const char* name);
+       extern void set_toggle_action (const char* group, const char* name, bool);
 
        extern void add_action_group (Glib::RefPtr<Gtk::ActionGroup>);
 
@@ -58,26 +61,34 @@ namespace ActionManager {
                                                                const char * name, const char * label, sigc::slot<void> sl,
                                                                guint key, Gdk::ModifierType mods);
        extern Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group, Gtk::RadioAction::Group&,
-                                                        const char * name, const char * label, sigc::slot<void> sl);
+                                                               const char * name, const char * label, sigc::slot<void> sl);
+       extern Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group, Gtk::RadioAction::Group&,
+                                                               std::string const &, std::string const &, std::string const &, sigc::slot<void> sl);
 
        extern Glib::RefPtr<Gtk::Action> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group,
                                                          const char * name, const char * label, sigc::slot<void> sl,
                                                          guint key, Gdk::ModifierType mods);
        extern Glib::RefPtr<Gtk::Action> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group,
-                                                         const char * name, const char * label, sigc::slot<void> sl);
+                                                                std::string const &, std::string const &, std::string const &, sigc::slot<void> sl);
+       extern Glib::RefPtr<Gtk::Action> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group,
+                                                                const char * name, const char * label, sigc::slot<void> sl);
 
        extern bool lookup_entry (const Glib::ustring accel_path, Gtk::AccelKey& key);
 
        extern void get_all_actions (std::vector<std::string>& names,
                                     std::vector<std::string>& paths,
+                                    std::vector<std::string>& tooltips,
                                     std::vector<std::string>& keys,
                                     std::vector<Gtk::AccelKey>& bindings);
 
        extern void get_all_actions (std::vector<std::string>& groups,
                                     std::vector<std::string>& paths,
+                                    std::vector<std::string>& tooltips,
                                     std::vector<Gtk::AccelKey>& bindings);
 
-       extern void uncheck_toggleaction (const char * actionname);
+       extern void check_toggleaction (std::string);
+       extern void uncheck_toggleaction (std::string);
+       extern void set_toggleaction_state (std::string, bool);
 };
 
 #endif /* __libgtkmm2ext_actions_h__ */