From d0fc12bd22107bf6f14a2c249ed340d40e596f58 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 1 Aug 2015 23:40:03 -0400 Subject: [PATCH] remove all action-registering API from Gtkmm2ext::ActionManager --- libs/gtkmm2ext/actions.cc | 70 ------------------------------ libs/gtkmm2ext/gtkmm2ext/actions.h | 24 ---------- 2 files changed, 94 deletions(-) diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc index 9471067de9..c562816259 100644 --- a/libs/gtkmm2ext/actions.cc +++ b/libs/gtkmm2ext/actions.cc @@ -53,76 +53,6 @@ using namespace Gtkmm2ext; RefPtr ActionManager::ui_manager; string ActionManager::unbound_string = "--"; - -RefPtr -ActionManager::register_action (RefPtr group, const char * name, const char * label, slot sl) -{ - RefPtr act; - - act = Action::create (name, label); - group->add (act, sl); - - return act; -} - -RefPtr -ActionManager::register_action (RefPtr group, const char * name, const char * label) -{ - RefPtr act; - - act = Action::create (name, label); - group->add (act); - - return act; -} - - -RefPtr -ActionManager::register_radio_action (RefPtr group, RadioAction::Group& rgroup, const char * name, const char * label, slot sl) -{ - RefPtr act; - - act = RadioAction::create (rgroup, name, label); - group->add (act, sl); - - return act; -} - -RefPtr -ActionManager::register_radio_action ( - RefPtr group, RadioAction::Group& rgroup, string const & name, string const & label, string const & tooltip, slot sl - ) -{ - RefPtr act; - - act = RadioAction::create (rgroup, name, label, tooltip); - group->add (act, sl); - - return act; -} - -RefPtr -ActionManager::register_toggle_action (RefPtr group, const char * name, const char * label, slot sl) -{ - RefPtr act; - - act = ToggleAction::create (name, label); - group->add (act, sl); - - return act; -} - -RefPtr -ActionManager::register_toggle_action (RefPtr group, string const & name, string const & label, string const & tooltip, slot sl) -{ - RefPtr act; - - act = ToggleAction::create (name, label, tooltip); - group->add (act, sl); - - return act; -} - bool ActionManager::lookup_entry (const ustring accel_path, Gtk::AccelKey& key) { diff --git a/libs/gtkmm2ext/gtkmm2ext/actions.h b/libs/gtkmm2ext/gtkmm2ext/actions.h index b03e351cbf..f0f4ffc572 100644 --- a/libs/gtkmm2ext/gtkmm2ext/actions.h +++ b/libs/gtkmm2ext/gtkmm2ext/actions.h @@ -52,30 +52,6 @@ namespace ActionManager { LIBGTKMM2EXT_API extern void add_action_group (Glib::RefPtr); LIBGTKMM2EXT_API extern void enable_accelerators (); - LIBGTKMM2EXT_API extern Glib::RefPtr register_action (Glib::RefPtr group, - const char * name, const char * label); - LIBGTKMM2EXT_API extern Glib::RefPtr register_action (Glib::RefPtr group, - const char * name, const char * label, sigc::slot sl, - guint key, Gdk::ModifierType mods); - LIBGTKMM2EXT_API extern Glib::RefPtr register_action (Glib::RefPtr group, - const char * name, const char * label, sigc::slot sl); - - LIBGTKMM2EXT_API extern Glib::RefPtr register_radio_action (Glib::RefPtr group, Gtk::RadioAction::Group&, - const char * name, const char * label, sigc::slot sl, - guint key, Gdk::ModifierType mods); - LIBGTKMM2EXT_API extern Glib::RefPtr register_radio_action (Glib::RefPtr group, Gtk::RadioAction::Group&, - const char * name, const char * label, sigc::slot sl); - LIBGTKMM2EXT_API extern Glib::RefPtr register_radio_action (Glib::RefPtr group, Gtk::RadioAction::Group&, - std::string const &, std::string const &, std::string const &, sigc::slot sl); - - LIBGTKMM2EXT_API extern Glib::RefPtr register_toggle_action (Glib::RefPtr group, - const char * name, const char * label, sigc::slot sl, - guint key, Gdk::ModifierType mods); - LIBGTKMM2EXT_API extern Glib::RefPtr register_toggle_action (Glib::RefPtr group, - std::string const &, std::string const &, std::string const &, sigc::slot sl); - LIBGTKMM2EXT_API extern Glib::RefPtr register_toggle_action (Glib::RefPtr group, - const char * name, const char * label, sigc::slot sl); - LIBGTKMM2EXT_API extern bool lookup_entry (const Glib::ustring accel_path, Gtk::AccelKey& key); LIBGTKMM2EXT_API extern void get_all_actions (std::vector& names,