[gtkmm] Improve the documentation of deprecation
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Improve the documentation of deprecation
- Date: Sat, 16 Jul 2016 08:49:58 +0000 (UTC)
commit a07f406c2c37c443b9f779bb65bafd2178c10f09
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Sat Jul 16 10:47:11 2016 +0200
Improve the documentation of deprecation
Improve the documentation of replacements for the deprecated classes
Gtk::UIManager, ActionGroup, Activatable, RadioAction, RecentAction and
ToggleAction. Gtk::Action was well documented in the previous commit.
Bug #768573.
gtk/src/actiongroup.ccg | 6 +--
gtk/src/actiongroup.hg | 93 +++++++++++++++++++++++++++++++--------------
gtk/src/activatable.hg | 32 ++++++++++-----
gtk/src/radioaction.ccg | 21 +---------
gtk/src/radioaction.hg | 54 ++++++++++++++++++++------
gtk/src/recentaction.ccg | 14 +------
gtk/src/recentaction.hg | 23 ++++++-----
gtk/src/toggleaction.ccg | 20 +--------
gtk/src/toggleaction.hg | 45 +++++++++++++++-------
gtk/src/uimanager.ccg | 3 +-
gtk/src/uimanager.hg | 77 +++++++++++++++++++++++--------------
11 files changed, 229 insertions(+), 159 deletions(-)
---
diff --git a/gtk/src/actiongroup.ccg b/gtk/src/actiongroup.ccg
index e9b9a5f..72e3978 100644
--- a/gtk/src/actiongroup.ccg
+++ b/gtk/src/actiongroup.ccg
@@ -24,6 +24,7 @@
namespace Gtk
{
+_DEPRECATE_IFDEF_START
void ActionGroup::add(const Glib::RefPtr<Action>& action)
{
gtk_action_group_add_action_with_accel(gobj(), Glib::unwrap(action),
@@ -65,8 +66,6 @@ void ActionGroup::add(const Glib::RefPtr<Action>& action, const AccelKey& accel_
gtk_action_group_add_action(gobj(), action->gobj());
}
-
-
void ActionGroup::add(const Glib::RefPtr<Action>& action, const Action::SlotActivate& slot)
{
//This is meant to be similar to the gtk_action_group_add_actions() convenience method that is used from C.
@@ -103,7 +102,6 @@ void ActionGroup::add(const Glib::RefPtr<Action>& action, const AccelKey& accel_
action->set_accel_path(accel_path);
*/
}
-
+_DEPRECATE_IFDEF_END
} // namespace Gtk
-
diff --git a/gtk/src/actiongroup.hg b/gtk/src/actiongroup.hg
index fe801a7..5ff58c1 100644
--- a/gtk/src/actiongroup.hg
+++ b/gtk/src/actiongroup.hg
@@ -35,7 +35,10 @@ _IS_DEPRECATED // This whole file is deprecated.
namespace Gtk
{
-/** @deprecated Use Gio::ActionGroup and Gio::Action instead.
+/** A deprecated action group.
+ * It is essentially a map from names to Gtk::Action objects.
+ *
+ * @deprecated Use Gio::ActionGroup and Gio::Action instead.
*/
class ActionGroup
: public Glib::Object,
@@ -45,51 +48,79 @@ class ActionGroup
_IMPLEMENTS_INTERFACE(Buildable)
protected:
+ /** @deprecated Use Gio::ActionGroup and give it a name with Gtk::Widget::insert_action_group().
+ */
_WRAP_CTOR(ActionGroup(const Glib::ustring& name = Glib::ustring()), gtk_action_group_new)
public:
+ /** @deprecated Use Gio::ActionGroup and give it a name with Gtk::Widget::insert_action_group().
+ */
_WRAP_CREATE(const Glib::ustring& name = Glib::ustring())
- _WRAP_METHOD(Glib::ustring get_name() const, gtk_action_group_get_name)
-
- _WRAP_METHOD(bool get_sensitive() const, gtk_action_group_get_sensitive)
- _WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_action_group_set_sensitive)
- _WRAP_METHOD(bool get_visible() const, gtk_action_group_get_visible)
- _WRAP_METHOD(void set_visible(bool visible = true), gtk_action_group_set_visible)
-
- _WRAP_METHOD(Glib::RefPtr<AccelGroup> get_accel_group(), gtk_action_group_get_accel_group, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const AccelGroup> get_accel_group() const, gtk_action_group_get_accel_group,
refreturn, constversion)
-
- _WRAP_METHOD(void set_accel_group (const Glib::RefPtr<AccelGroup>& accel_group),
gtk_action_group_set_accel_group)
-
- _WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& action_name),
gtk_action_group_get_action, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Action> get_action(const Glib::ustring& action_name) const,
gtk_action_group_get_action, refreturn, constversion)
+ _WRAP_METHOD(Glib::ustring get_name() const, gtk_action_group_get_name,
+ deprecated "There is no corresponding replacement when using Gio::ActionGroup.")
+
+ _WRAP_METHOD(bool get_sensitive() const, gtk_action_group_get_sensitive,
+ deprecated "Use Gio::ActionGroup::get_action_enabled() or Gio::Action::get_enabled() instead.")
+ _WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_action_group_set_sensitive,
+ deprecated "Use Gio::SimpleAction::set_enabled() instead.")
+ _WRAP_METHOD(bool get_visible() const, gtk_action_group_get_visible,
+ deprecated "Use Gio::ActionGroup instead, and control and monitor the state of Gtk::Actionable widgets
directly.")
+ _WRAP_METHOD(void set_visible(bool visible = true), gtk_action_group_set_visible,
+ deprecated "Use Gio::ActionGroup instead, and control and monitor the state of Gtk::Actionable widgets
directly.")
+
+ _WRAP_METHOD(Glib::RefPtr<AccelGroup> get_accel_group(), gtk_action_group_get_accel_group, refreturn,
+ deprecated "Use Gio::ActionGroup and the accelerator group on an associated Gtk::Menu instead.")
+ _WRAP_METHOD(Glib::RefPtr<const AccelGroup> get_accel_group() const, gtk_action_group_get_accel_group,
refreturn, constversion,
+ deprecated "Use Gio::ActionGroup and the accelerator group on an associated Gtk::Menu instead.")
+ _WRAP_METHOD(void set_accel_group (const Glib::RefPtr<AccelGroup>& accel_group),
gtk_action_group_set_accel_group,
+ deprecated "Use Gio::ActionGroup and the accelerator group on an associated Gtk::Menu instead.")
+
+ _WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& action_name),
gtk_action_group_get_action, refreturn,
+ deprecated "Use Gio::ActionMap::lookup_action() on a Gio::SimpleActionGroup instead.")
+ _WRAP_METHOD(Glib::RefPtr<const Action> get_action(const Glib::ustring& action_name) const,
gtk_action_group_get_action, refreturn, constversion,
+ deprecated "Use Gio::ActionMap::lookup_action() on a Gio::SimpleActionGroup instead.")
#m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Action> >',`Glib::ListHandler< Glib::RefPtr<Action>
::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
- _WRAP_METHOD(std::vector< Glib::RefPtr<Action> > get_actions(), gtk_action_group_list_actions)
+ _WRAP_METHOD(std::vector< Glib::RefPtr<Action> > get_actions(), gtk_action_group_list_actions,
+ deprecated "Use Gio::ActionGroup::list_actions() and Gio::ActionMap::lookup_action() on a
Gio::SimpleActionGroup instead.")
#m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<const Action> >',`Glib::ListHandler< Glib::RefPtr<const
Action> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
- _WRAP_METHOD(std::vector< Glib::RefPtr<const Action> > get_actions() const, gtk_action_group_list_actions)
+ _WRAP_METHOD(std::vector< Glib::RefPtr<const Action> > get_actions() const, gtk_action_group_list_actions,
+ deprecated "Use Gio::ActionGroup::list_actions() and Gio::ActionMap::lookup_action() on a
Gio::SimpleActionGroup instead.")
+_DEPRECATE_IFDEF_START
+ /** @deprecated Use Gio::ActionMap::add_action() on a Gio::SimpleActionGroup instead.
+ */
void add(const Glib::RefPtr<Action>& action);
_IGNORE(gtk_action_group_add_action)
//We want it to always try to use the stock accelerator,
//so we use gtk_action_group_add_action_with_accel(), instead of gtk_action_group_add_action(),
//passing null for the accelerator.
+ /** @deprecated Use Gio::ActionMap::add_action() on a Gio::SimpleActionGroup instead,
+ * and Gtk::Application::set_accel_for_action().
+ */
void add(const Glib::RefPtr<Action>& action, const AccelKey& accel_key);
_IGNORE(gtk_action_group_add_action_with_accel)
//We need to duplicate the gtk_action_group_add_action_with_accel() implementation, because we want to
//use AccelKey, not just the accelerator string format that is _one_ of the ways to create an AccelKey.
//TODO: Could this whole class have an STL-style interface?
+ /** @deprecated Use Gio::ActionMap::add_action() on a Gio::SimpleActionGroup instead.
+ */
void add(const Glib::RefPtr<Action>& action, const Action::SlotActivate& slot);
+ /** @deprecated Use Gio::ActionMap::add_action() on a Gio::SimpleActionGroup instead,
+ * and Gtk::Application::set_accel_for_action().
+ */
void add(const Glib::RefPtr<Action>& action, const AccelKey& accel_key, const Action::SlotActivate& slot);
- _WRAP_METHOD(void remove(const Glib::RefPtr<Action>& action), gtk_action_group_remove_action)
+_DEPRECATE_IFDEF_END
+ _WRAP_METHOD(void remove(const Glib::RefPtr<Action>& action), gtk_action_group_remove_action,
+ deprecated "Use Gio::ActionMap::remove_action() on a Gio::SimpleActionGroup instead.")
//TODO: We probably need to use this in our add_actions() implementation.
//But this whole class is deprecated anyway.
- _WRAP_METHOD(Glib::ustring translate_string(const Glib::ustring& string) const,
gtk_action_group_translate_string)
-
+ _WRAP_METHOD(Glib::ustring translate_string(const Glib::ustring& string) const,
gtk_action_group_translate_string,
+ deprecated "There is no corresponding replacement when using Gio::ActionGroup.")
//These are just C convenience methods:
_IGNORE(gtk_action_group_add_actions, gtk_action_group_add_toggle_actions,
gtk_action_group_add_radio_actions,
@@ -99,15 +130,19 @@ public:
_IGNORE(gtk_action_group_set_translate_func, gtk_action_group_set_translation_domain)
#m4 _CONVERSION(`GtkAction*',`const Glib::RefPtr<Action>&',`Glib::wrap($3, true)')
- _WRAP_SIGNAL(void connect_proxy(const Glib::RefPtr<Action>& action, Widget* proxy), "connect_proxy",
no_default_handler)
- _WRAP_SIGNAL(void disconnect_proxy(const Glib::RefPtr<Action>& action, Widget* proxy), "disconnect_proxy",
no_default_handler)
- _WRAP_SIGNAL(void pre_activate(const Glib::RefPtr<Action>& action), "pre_activate", no_default_handler)
- _WRAP_SIGNAL(void post_activate(const Glib::RefPtr<Action>& action), "post_activate", no_default_handler)
-
- _WRAP_PROPERTY("name", Glib::ustring)
- _WRAP_PROPERTY("sensitive", bool)
- _WRAP_PROPERTY("visible", bool)
- _WRAP_PROPERTY("accel-group", Glib::RefPtr<AccelGroup>)
+ _WRAP_SIGNAL(void connect_proxy(const Glib::RefPtr<Action>& action, Widget* proxy), "connect_proxy",
no_default_handler,
+ deprecated "There is no corresponding replacement when using Gio::ActionGroup.")
+ _WRAP_SIGNAL(void disconnect_proxy(const Glib::RefPtr<Action>& action, Widget* proxy), "disconnect_proxy",
no_default_handler,
+ deprecated "There is no corresponding replacement when using Gio::ActionGroup.")
+ _WRAP_SIGNAL(void pre_activate(const Glib::RefPtr<Action>& action), "pre_activate", no_default_handler,
+ deprecated "There is no corresponding replacement when using Gio::ActionGroup.")
+ _WRAP_SIGNAL(void post_activate(const Glib::RefPtr<Action>& action), "post_activate", no_default_handler,
+ deprecated "There is no corresponding replacement when using Gio::ActionGroup.")
+
+ _WRAP_PROPERTY("name", Glib::ustring, deprecated "There is no corresponding replacement when using
Gio::ActionGroup.")
+ _WRAP_PROPERTY("sensitive", bool, deprecated "Use Gio::Action::property_enabled() and
Gio::SimpleAction::property_enabled() instead.")
+ _WRAP_PROPERTY("visible", bool, deprecated "There is no corresponding replacement when using
Gio::ActionGroup.")
+ _WRAP_PROPERTY("accel-group", Glib::RefPtr<AccelGroup>, deprecated "Use Gio::ActionGroup and the
accelerator group on an associated Gtk::Menu instead.")
};
} // namespace Gtk
diff --git a/gtk/src/activatable.hg b/gtk/src/activatable.hg
index 7f5f966..bb11899 100644
--- a/gtk/src/activatable.hg
+++ b/gtk/src/activatable.hg
@@ -38,29 +38,39 @@ typedef struct _GtkActivatableIface GtkActivatableIface;
namespace Gtk
{
-/** Activatable widgets can be connected to a Gtk::Action and reflect the state
- * of the action. An Activatable can also provide feedback through its action,
+/** %Activatable widgets can be connected to a Gtk::Action and reflect the state
+ * of the action. An %Activatable can also provide feedback through its action,
* as it is responsible for activating the related action.
*
* @newin{2,16}
*
* @deprecated Use Gio::Action instead of Gtk::Action.
+ * Gtk::Actionable is roughly a replacement for %Gtk::Activatable.
*/
class Activatable : public Glib::Interface
{
_CLASS_INTERFACE(Activatable, GtkActivatable, GTK_ACTIVATABLE, GtkActivatableIface)
public:
- _WRAP_METHOD(void do_set_related_action(const Glib::RefPtr<Action>& action),
gtk_activatable_do_set_related_action, deprecated "Use Gio::Action instead of Gtk::Action.")
- _WRAP_METHOD(Glib::RefPtr<Action> get_related_action(), gtk_activatable_get_related_action, refreturn,
deprecated "Use Gio::Action instead of Gtk::Action.")
- _WRAP_METHOD(Glib::RefPtr<const Action> get_related_action() const, gtk_activatable_get_related_action,
refreturn, constversion, deprecated "Use Gio::Action instead of Gtk::Action.")
- _WRAP_METHOD(bool get_use_action_appearance() const, gtk_activatable_get_use_action_appearance, deprecated
"Use Gio::Action instead of Gtk::Action.")
- _WRAP_METHOD(void sync_action_properties(const Glib::RefPtr<Action>& action),
gtk_activatable_sync_action_properties, deprecated "Use Gio::Action instead of Gtk::Action.")
- _WRAP_METHOD(void set_related_action(const Glib::RefPtr<Action>& action),
gtk_activatable_set_related_action, deprecated "Use Gio::Action instead of Gtk::Action.")
- _WRAP_METHOD(void set_use_action_appearance(bool use_appearance = true),
gtk_activatable_set_use_action_appearance, deprecated "Use Gio::Action instead of Gtk::Action.")
+ _WRAP_METHOD(void do_set_related_action(const Glib::RefPtr<Action>& action),
gtk_activatable_do_set_related_action,
+ deprecated "There is no corresponding replacement when using Gio::Action.")
+ _WRAP_METHOD(Glib::RefPtr<Action> get_related_action(), gtk_activatable_get_related_action, refreturn,
+ deprecated "Use Gtk::Actionable::get_action_name() on Gtk::Actionable widgets instead.")
+ _WRAP_METHOD(Glib::RefPtr<const Action> get_related_action() const, gtk_activatable_get_related_action,
refreturn, constversion,
+ deprecated "Use Gtk::Actionable::get_action_name() on Gtk::Actionable widgets instead.")
+ _WRAP_METHOD(bool get_use_action_appearance() const, gtk_activatable_get_use_action_appearance,
+ deprecated "There is no corresponding replacement when using Gio::Action.")
+ _WRAP_METHOD(void sync_action_properties(const Glib::RefPtr<Action>& action),
gtk_activatable_sync_action_properties,
+ deprecated "There is no corresponding replacement when using Gio::Action.")
+ _WRAP_METHOD(void set_related_action(const Glib::RefPtr<Action>& action),
gtk_activatable_set_related_action,
+ deprecated "Use Gtk::Actionable::set_action_name() on Gtk::Actionable widgets instead.")
+ _WRAP_METHOD(void set_use_action_appearance(bool use_appearance = true),
gtk_activatable_set_use_action_appearance,
+ deprecated "There is no corresponding replacement when using Gio::Action.")
- _WRAP_PROPERTY("related-action", Glib::RefPtr<Action>, deprecated "Use Gio::Action instead of
Gtk::Action.")
- _WRAP_PROPERTY("use-action-appearance", bool, deprecated "Use Gio::Action instead of Gtk::Action.")
+ _WRAP_PROPERTY("related-action", Glib::RefPtr<Action>,
+ deprecated "Use Gtk::Actionable::property_action_name() on Gtk::Actionable widgets instead.")
+ _WRAP_PROPERTY("use-action-appearance", bool,
+ deprecated "There is no corresponding replacement when using Gio::Action.")
#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
#m4 _CONVERSION(`GtkAction*',`const Glib::RefPtr<Action>&',`Glib::wrap($3, true)')
diff --git a/gtk/src/radioaction.ccg b/gtk/src/radioaction.ccg
index 249503b..7059ec3 100644
--- a/gtk/src/radioaction.ccg
+++ b/gtk/src/radioaction.ccg
@@ -30,7 +30,6 @@ RadioAction::RadioAction(Group& group, const Glib::ustring& name, const Gtk::Sto
{
set_group(group);
}
-_DEPRECATE_IFDEF_END
RadioAction::RadioAction(Group& group, const Glib::ustring& name, const Glib::ustring& icon_name, const
Glib::ustring& label, const Glib::ustring& tooltip)
:
@@ -38,30 +37,18 @@ RadioAction::RadioAction(Group& group, const Glib::ustring& name, const Glib::us
{
set_group(group);
}
+_DEPRECATE_IFDEF_END
+_DEPRECATE_IFDEF_START
Glib::RefPtr<RadioAction> RadioAction::create(Group& group, const Glib::ustring& name, const Glib::ustring&
label, const Glib::ustring& tooltip)
{
-_DEPRECATE_IFDEF_START
return Glib::RefPtr<RadioAction>( new RadioAction(group, name, Gtk::StockID(), label, tooltip) );
-#else // GTKMM_DISABLE_DEPRECATED
- // StockID is deprecated. Can't call the constructor that takes a StockID.
- Glib::RefPtr<RadioAction> action(new RadioAction());
- action->set_name(name);
- action->set_group(group);
- if (!label.empty())
- action->set_label(label);
- if (!tooltip.empty())
- action->set_tooltip(tooltip);
- return action;
-_DEPRECATE_IFDEF_END
}
-_DEPRECATE_IFDEF_START
Glib::RefPtr<RadioAction> RadioAction::create(Group& group, const Glib::ustring& name, const Gtk::StockID&
stock_id, const Glib::ustring& label, const Glib::ustring& tooltip)
{
return Glib::RefPtr<RadioAction>( new RadioAction(group, name, stock_id, label, tooltip) );
}
-_DEPRECATE_IFDEF_END
Glib::RefPtr<RadioAction> RadioAction::create_with_icon_name(Group& group, const Glib::ustring& name, const
Glib::ustring& icon_name, const Glib::ustring& label, const Glib::ustring& tooltip)
{
@@ -75,8 +62,6 @@ void RadioAction::set_group(Group& group)
//The group will be updated, ready for use with the next radio action:
group = get_group();
}
-
-
+_DEPRECATE_IFDEF_END
} // namespace Gtk
-
diff --git a/gtk/src/radioaction.hg b/gtk/src/radioaction.hg
index 539ae21..98b5845 100644
--- a/gtk/src/radioaction.hg
+++ b/gtk/src/radioaction.hg
@@ -65,10 +65,9 @@ _DEPRECATE_IFDEF_START
* @param label The label displayed in menu items and on buttons.
* @param tooltip A tooltip for the action.
*
- * @deprecated Stock IDs are deprecated, so use the other constructor.
+ * @deprecated There is no corresponding replacement when using Gio::Action.
*/
explicit RadioAction(Group& group, const Glib::ustring& name, const StockID& stock_id = StockID(), const
Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
-_DEPRECATE_IFDEF_END
/** Creates a radio action with an icon name.
* The radio action's icon will reflect the specified icon name in the
@@ -80,14 +79,23 @@ _DEPRECATE_IFDEF_END
* action.
* @param label The label displayed in menu items and on buttons.
* @param tooltip A tooltip for the action.
+ * @deprecated Use Gio::Action, which can be created by Gio::ActionMap::add_action_radio_string()
+ * or Gio::ActionMap::add_action_radio_integer().<br>
+ * Use Gio::MenuItem::set_icon() to set an icon on a Gio::MenuItem associated with a Gio::Action,
+ * or Gtk::Container::add() to add a Gtk::Image to a Gtk::RadioButton.<br>
+ * Set a label on a menu item with Gio::MenuItem::set_label().
+ * For Gtk::Actionable widgets, use the widget-specific API to set a label.<br>
+ * Set tooltips on associated Gtk::Actionable widgets with Gtk::Widget::set_tooltip_text().
*/
explicit RadioAction(Group& group, const Glib::ustring& name, const Glib::ustring& icon_name, const
Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
+_DEPRECATE_IFDEF_END
public:
//Note that gtk_recent_action_new() does not allow name to be NULL, which suggests that we should not have
a default constructor,
//but it's OK to set the name later:
_WRAP_CREATE()
+_DEPRECATE_IFDEF_START
/** Creates a radio action.
*
* @param group The radio group this action belongs to.
@@ -96,10 +104,14 @@ public:
* @param tooltip A tooltip for the action.
*
* @return A new RadioAction.
+ * @deprecated Use Gio::Action, which can be created by Gio::ActionMap::add_action_radio_string()
+ * or Gio::ActionMap::add_action_radio_integer().<br>
+ * Set a label on a menu item with Gio::MenuItem::set_label().
+ * For Gtk::Actionable widgets, use the widget-specific API to set a label.<br>
+ * Set tooltips on associated Gtk::Actionable widgets with Gtk::Widget::set_tooltip_text().
*/
static Glib::RefPtr<RadioAction> create(Group& group, const Glib::ustring& name, const Glib::ustring&
label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
-_DEPRECATE_IFDEF_START
/** Creates a radio action with a stock ID.
* The stock ID is used to set a default icon, text and accelerator for
* the radio action.
@@ -113,10 +125,9 @@ _DEPRECATE_IFDEF_START
*
* @return A new RadioAction.
*
- * @deprecated Stock IDs are deprecated, so use the other create() method.
+ * @deprecated There is no corresponding replacement when using Gio::Action.
*/
static Glib::RefPtr<RadioAction> create(Group& group, const Glib::ustring& name, const Gtk::StockID&
stock_id, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
-_DEPRECATE_IFDEF_END
/** Creates a radio action with an icon name.
* The radio action's icon will reflect the specified icon name in the
@@ -130,26 +141,43 @@ _DEPRECATE_IFDEF_END
* @param tooltip A tooltip for the action.
*
* @return A new RadioAction.
+ * @deprecated Use Gio::Action, which can be created by Gio::ActionMap::add_action_radio_string()
+ * or Gio::ActionMap::add_action_radio_integer().<br>
+ * Use Gio::MenuItem::set_icon() to set an icon on a Gio::MenuItem associated with a Gio::Action,
+ * or Gtk::Container::add() to add a Gtk::Image to a Gtk::RadioButton.<br>
+ * Set a label on a menu item with Gio::MenuItem::set_label().
+ * For Gtk::Actionable widgets, use the widget-specific API to set a label.<br>
+ * Set tooltips on associated Gtk::Actionable widgets with Gtk::Widget::set_tooltip_text().
*/
static Glib::RefPtr<RadioAction> create_with_icon_name(Group& group, const Glib::ustring& name, const
Glib::ustring& icon_name, const Glib::ustring& label, const Glib::ustring& tooltip);
+_DEPRECATE_IFDEF_END
- _WRAP_METHOD(Group get_group(), gtk_radio_action_get_group)
- void set_group(Group& group);
+ _WRAP_METHOD(Group get_group(), gtk_radio_action_get_group,
+ deprecated "There is no corresponding replacement when using Gio::Action.")
+_DEPRECATE_IFDEF_START
+ /** @deprecated There is no corresponding replacement when using Gio::Action.
+ */
+ void set_group(Group& group);
+_DEPRECATE_IFDEF_END
_IGNORE(gtk_radio_action_set_group)
- _WRAP_METHOD(void join_group(const Glib::RefPtr<RadioAction>& group_source), gtk_radio_action_join_group)
+ _WRAP_METHOD(void join_group(const Glib::RefPtr<RadioAction>& group_source), gtk_radio_action_join_group,
+ deprecated "There is no corresponding replacement when using Gio::Action.")
- _WRAP_METHOD(int get_current_value() const, gtk_radio_action_get_current_value)
- _WRAP_METHOD(void set_current_value(int current_value), gtk_radio_action_set_current_value)
+ _WRAP_METHOD(int get_current_value() const, gtk_radio_action_get_current_value,
+ deprecated "Use Gio::Action::get_state() on a Gio::Action instead.")
+ _WRAP_METHOD(void set_current_value(int current_value), gtk_radio_action_set_current_value,
+ deprecated "Use Gio::Action::change_state() on a Gio::Action instead.")
#m4 _CONVERSION(`GtkRadioAction*',`const Glib::RefPtr<RadioAction>&',`Glib::wrap($3, true)')
- _WRAP_SIGNAL(void changed(const Glib::RefPtr<RadioAction>& current), changed)
+ _WRAP_SIGNAL(void changed(const Glib::RefPtr<RadioAction>& current), changed,
+ deprecated "Use Gio::SimpleAction::signal_activate() or Gio::SimpleAction::signal_change_state()
instead.")
- _WRAP_PROPERTY("value", int)
+ _WRAP_PROPERTY("value", int, deprecated "Use Gio::Action instead, and
Gtk::Actionable::property_action_target() on one of the associated actionable widgets.")
//Probably wouldn't work: _WRAP_PROPERTY("group", Group)
_IGNORE_PROPERTY(group)
- _WRAP_PROPERTY("current-value", int)
+ _WRAP_PROPERTY("current-value", int, deprecated "Use Gio::Action::property_state() and
Gio::SimpleAction::property_state() instead.")
};
} // namespace Gtk
diff --git a/gtk/src/recentaction.ccg b/gtk/src/recentaction.ccg
index 9ad53b9..9953cc3 100644
--- a/gtk/src/recentaction.ccg
+++ b/gtk/src/recentaction.ccg
@@ -39,23 +39,12 @@ RecentAction::RecentAction(const Glib::ustring& name, const StockID& stock_id, c
}
_DEPRECATE_IFDEF_END
+_DEPRECATE_IFDEF_START
Glib::RefPtr<RecentAction> RecentAction::create(const Glib::ustring& name, const Glib::ustring& label, const
Glib::ustring& tooltip)
{
-_DEPRECATE_IFDEF_START
return Glib::RefPtr<RecentAction>( new RecentAction(name, StockID(), label, tooltip) );
-#else // GTKMM_DISABLE_DEPRECATED
- // StockID is deprecated. Can't call the constructor that takes a StockID.
- Glib::RefPtr<RecentAction> action(new RecentAction());
- action->set_name(name);
- if (!label.empty())
- action->set_label(label);
- if (!tooltip.empty())
- action->set_tooltip(tooltip);
- return action;
-_DEPRECATE_IFDEF_END
}
-_DEPRECATE_IFDEF_START
Glib::RefPtr<RecentAction> RecentAction::create(const Glib::ustring& name, const Gtk::StockID& stock_id,
const Glib::ustring& label, const Glib::ustring& tooltip)
{
return Glib::RefPtr<RecentAction>( new RecentAction(name, stock_id, label, tooltip) );
@@ -68,4 +57,3 @@ Glib::RefPtr<RecentAction> RecentAction::create(const Glib::ustring& name, const
_DEPRECATE_IFDEF_END
} // namespace Gtk
-
diff --git a/gtk/src/recentaction.hg b/gtk/src/recentaction.hg
index 29c2bd1..61c5d69 100644
--- a/gtk/src/recentaction.hg
+++ b/gtk/src/recentaction.hg
@@ -74,12 +74,12 @@ _DEPRECATE_IFDEF_START
//a) we want to be consistent with Action, ToggleAction, etc.
//b) this allows us to use the StockID parameter to distinguish the create() overloads.
/**
- * @deprecated Stock IDs are deprecated, so use another constructor.
+ * @deprecated There is no corresponding replacement when using Gio::Action.
*/
explicit RecentAction(const Glib::ustring& name, const StockID& stock_id = StockID(), const Glib::ustring&
label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
/**
- * @deprecated Stock IDs are deprecated, so use another constructor.
+ * @deprecated There is no corresponding replacement when using Gio::Action.
*/
explicit RecentAction(const Glib::ustring& name, const StockID& stock_id, const Glib::ustring& label,
const Glib::ustring& tooltip, const Glib::RefPtr<RecentManager>& recent_manager);
_DEPRECATE_IFDEF_END
@@ -89,29 +89,32 @@ public:
//but it's OK to set the name later:
_WRAP_CREATE()
+_DEPRECATE_IFDEF_START
+ /**
+ * @deprecated Use Gtk::RecentChooser::set_show_tips() to control tooltips on a Gtk::RecentChooserMenu.
+ */
static Glib::RefPtr<RecentAction> create(const Glib::ustring& name, const Glib::ustring& label =
Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
// _WRAP_CREATE does not take a 'deprecated' parameter.
// _WRAP_CREATE(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label =
Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring())
// _WRAP_CREATE(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label, const
Glib::ustring& tooltip, const Glib::RefPtr<RecentManager>& recent_manager)
-_DEPRECATE_IFDEF_START
/**
- * @deprecated Stock IDs are deprecated, so use another create() method.
+ * @deprecated There is no corresponding replacement when using Gio::Action.
*/
static Glib::RefPtr<RecentAction> create(const Glib::ustring& name, const Gtk::StockID& stock_id, const
Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
/**
- * @deprecated Stock IDs are deprecated, so use another create() method.
+ * @deprecated There is no corresponding replacement when using Gio::Action.
*/
static Glib::RefPtr<RecentAction> create(const Glib::ustring& name, const Gtk::StockID& stock_id, const
Glib::ustring& label, const Glib::ustring& tooltip, const Glib::RefPtr<RecentManager>& recent_manager);
_DEPRECATE_IFDEF_END
+ _WRAP_METHOD(bool get_show_numbers(), gtk_recent_action_get_show_numbers,
+ deprecated "Use Gtk::RecentChooserMenu::get_show_numbers() instead.")
+ _WRAP_METHOD(void set_show_numbers(bool show_numbers = true), gtk_recent_action_set_show_numbers,
+ deprecated "Use Gtk::RecentChooserMenu::set_show_numbers() instead.")
- _WRAP_METHOD(bool get_show_numbers(), gtk_recent_action_get_show_numbers)
- _WRAP_METHOD(void set_show_numbers(bool show_numbers = true), gtk_recent_action_set_show_numbers)
-
- _WRAP_PROPERTY("show-numbers", bool)
+ _WRAP_PROPERTY("show-numbers", bool, deprecated "Use Gtk::RecentChooserMenu::property_show_numbers()
instead.")
};
} // namespace Gtk
-
diff --git a/gtk/src/toggleaction.ccg b/gtk/src/toggleaction.ccg
index affc08f..8d30c8a 100644
--- a/gtk/src/toggleaction.ccg
+++ b/gtk/src/toggleaction.ccg
@@ -28,7 +28,6 @@ ToggleAction::ToggleAction(const Glib::ustring& name, const Gtk::StockID& stock_
{
set_active(is_active);
}
-_DEPRECATE_IFDEF_END
ToggleAction::ToggleAction(const Glib::ustring& name, const Glib::ustring& icon_name, const Glib::ustring&
label, const Glib::ustring& tooltip, bool is_active)
:
@@ -36,36 +35,23 @@ ToggleAction::ToggleAction(const Glib::ustring& name, const Glib::ustring& icon_
{
set_active(is_active);
}
+_DEPRECATE_IFDEF_END
+_DEPRECATE_IFDEF_START
Glib::RefPtr<ToggleAction> ToggleAction::create(const Glib::ustring& name, const Glib::ustring& label, const
Glib::ustring& tooltip, bool is_active)
{
-_DEPRECATE_IFDEF_START
return Glib::RefPtr<ToggleAction>( new ToggleAction(name, Gtk::StockID(), label, tooltip, is_active) );
-#else // GTKMM_DISABLE_DEPRECATED
- // StockID is deprecated. Can't call the constructor that takes a StockID.
- Glib::RefPtr<ToggleAction> action(new ToggleAction());
- action->set_name(name);
- action->set_active(is_active);
- if (!label.empty())
- action->set_label(label);
- if (!tooltip.empty())
- action->set_tooltip(tooltip);
- return action;
-_DEPRECATE_IFDEF_END
}
-_DEPRECATE_IFDEF_START
Glib::RefPtr<ToggleAction> ToggleAction::create(const Glib::ustring& name, const Gtk::StockID& stock_id,
const Glib::ustring& label, const Glib::ustring& tooltip, bool is_active)
{
return Glib::RefPtr<ToggleAction>( new ToggleAction(name, stock_id, label, tooltip, is_active) );
}
-_DEPRECATE_IFDEF_END
Glib::RefPtr<ToggleAction> ToggleAction::create_with_icon_name(const Glib::ustring& name, const
Glib::ustring& icon_name, const Glib::ustring& label, const Glib::ustring& tooltip, bool is_active)
{
return Glib::RefPtr<ToggleAction>( new ToggleAction(name, icon_name, label, tooltip, is_active) );
}
-
+_DEPRECATE_IFDEF_END
} // namespace Gtk
-
diff --git a/gtk/src/toggleaction.hg b/gtk/src/toggleaction.hg
index ca773e8..1d84b39 100644
--- a/gtk/src/toggleaction.hg
+++ b/gtk/src/toggleaction.hg
@@ -58,10 +58,9 @@ _DEPRECATE_IFDEF_START
* @param tooltip A tooltip for the action.
* @param is_active The default checked state of the action.
*
- * @deprecated Stock IDs are deprecated, so use another constructor.
+ * @deprecated There is no corresponding replacement when using Gio::Action.
*/
explicit ToggleAction(const Glib::ustring& name, const StockID& stock_id = StockID(), const
Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring(), bool is_active =
false);
-_DEPRECATE_IFDEF_END
/** Creates a toggle action with an icon name.
* The toggle action's icon will reflect the specified icon name in the
@@ -73,14 +72,22 @@ _DEPRECATE_IFDEF_END
* @param label The label displayed in menu items and on buttons.
* @param tooltip A tooltip for the action.
* @param is_active The default checked state of the action.
+ * @deprecated Use Gio::Action, which can be created by Gio::ActionMap::add_action_bool().<br>
+ * Use Gio::MenuItem::set_icon() to set an icon on a Gio::MenuItem associated with a Gio::Action,
+ * or Gtk::Container::add() to add a Gtk::Image to a Gtk::ToggleButton.<br>
+ * Set a label on a menu item with Gio::MenuItem::set_label().
+ * For Gtk::Actionable widgets, use the widget-specific API to set a label.<br>
+ * Set tooltips on associated Gtk::Actionable widgets with Gtk::Widget::set_tooltip_text().
*/
explicit ToggleAction(const Glib::ustring& name, const Glib::ustring& icon_name, const Glib::ustring&
label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring(), bool is_active = false);
+_DEPRECATE_IFDEF_END
public:
//Note that gtk_toggle_action_new() does not allow name to be NULL, which suggests that we should not have
a default constructor,
//but it's OK to set the name later:
_WRAP_CREATE()
+_DEPRECATE_IFDEF_START
/** Creates a toggle action.
*
* @param name A unique name for the action.
@@ -89,10 +96,13 @@ public:
* @param is_active The default checked state of the action.
*
* @return A new ToggleAction.
+ * @deprecated Use Gio::Action, which can be created by Gio::ActionMap::add_action_bool().<br>
+ * Set a label on a menu item with Gio::MenuItem::set_label().
+ * For Gtk::Actionable widgets, use the widget-specific API to set a label.<br>
+ * Set tooltips on associated Gtk::Actionable widgets with Gtk::Widget::set_tooltip_text().
*/
static Glib::RefPtr<ToggleAction> create(const Glib::ustring& name, const Glib::ustring& label =
Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring(), bool is_active = false);
-_DEPRECATE_IFDEF_START
/** Creates a toggle action with a stock ID.
* The tock ID is used to set a default icon, text and accelerator for
* the toggle action.
@@ -105,10 +115,9 @@ _DEPRECATE_IFDEF_START
* @param is_active The default checked state of the action.
*
* @return A new ToggleAction.
- * @deprecated Stock IDs are deprecated, so use another create() method.
+ * @deprecated There is no corresponding replacement when using Gio::Action.
*/
static Glib::RefPtr<ToggleAction> create(const Glib::ustring& name, const Gtk::StockID& stock_id, const
Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring(), bool is_active =
false);
-_DEPRECATE_IFDEF_END
/** Creates a toggle action with an icon name.
* The toggle action's icon will reflect the specified icon name in the
@@ -122,20 +131,28 @@ _DEPRECATE_IFDEF_END
* @param is_active The default checked state of the action.
*
* @return A new ToggleAction.
+ * @deprecated Use Gio::Action, which can be created by Gio::ActionMap::add_action_bool().<br>
+ * Use Gio::MenuItem::set_icon() to set an icon on a Gio::MenuItem associated with a Gio::Action,
+ * or Gtk::Container::add() to add a Gtk::Image to a Gtk::ToggleButton.<br>
+ * Set a label on a menu item with Gio::MenuItem::set_label().
+ * For Gtk::Actionable widgets, use the widget-specific API to set a label.<br>
+ * Set tooltips on associated Gtk::Actionable widgets with Gtk::Widget::set_tooltip_text().
*/
static Glib::RefPtr<ToggleAction> create_with_icon_name(const Glib::ustring& name, const Glib::ustring&
icon_name, const Glib::ustring& label, const Glib::ustring& tooltip, bool is_active = false);
+_DEPRECATE_IFDEF_END
- _WRAP_METHOD(void toggled(), gtk_toggle_action_toggled)
- _WRAP_METHOD(void set_active(bool is_active = true), gtk_toggle_action_set_active)
- _WRAP_METHOD(bool get_active() const, gtk_toggle_action_get_active)
- _WRAP_METHOD(void set_draw_as_radio(bool draw_as_radio = true), gtk_toggle_action_set_draw_as_radio)
- _WRAP_METHOD(bool get_draw_as_radio() const, gtk_toggle_action_get_draw_as_radio)
+ _WRAP_METHOD(void toggled(), gtk_toggle_action_toggled, deprecated "Use Gio::Action::activate() on a
Gio::Action instead.")
+ _WRAP_METHOD(void set_active(bool is_active = true), gtk_toggle_action_set_active, deprecated "Use
Gio::Action::change_state() on a Gio::Action instead.")
+ _WRAP_METHOD(bool get_active() const, gtk_toggle_action_get_active, deprecated "Use
Gio::Action::get_state() on a Gio::Action instead.")
+ _WRAP_METHOD(void set_draw_as_radio(bool draw_as_radio = true), gtk_toggle_action_set_draw_as_radio,
+ deprecated "Use Gtk::CheckMenuItem::set_draw_as_radio() on a Gtk::CheckMenuItem instead.")
+ _WRAP_METHOD(bool get_draw_as_radio() const, gtk_toggle_action_get_draw_as_radio,
+ deprecated "Use Gtk::CheckMenuItem::get_draw_as_radio() on a Gtk::CheckMenuItem instead.")
- _WRAP_SIGNAL(void toggled(), "toggled")
+ _WRAP_SIGNAL(void toggled(), "toggled", deprecated "Use Gio::SimpleAction::signal_activate() or
Gio::SimpleAction::signal_change_state() instead.")
- _WRAP_PROPERTY("draw_as_radio", bool)
- _WRAP_PROPERTY("active", bool)
+ _WRAP_PROPERTY("draw_as_radio", bool, deprecated "Use Gtk::CheckMenuItem::property_draw_as_radio() on a
Gtk::CheckMenuItem instead.")
+ _WRAP_PROPERTY("active", bool, deprecated "Use Gio::Action::property_state() and
Gio::SimpleAction::property_state() instead.")
};
} // namespace Gtk
-
diff --git a/gtk/src/uimanager.ccg b/gtk/src/uimanager.ccg
index c88400a..8bb51f2 100644
--- a/gtk/src/uimanager.ccg
+++ b/gtk/src/uimanager.ccg
@@ -26,6 +26,7 @@ namespace Gtk
typedef UIManager::ui_merge_id ui_merge_id; //Help gmmproc so that it does not need to add the full type
name for the return type.
+_DEPRECATE_IFDEF_START
UIManager::ui_merge_id UIManager::add_ui_from_string(const Glib::ustring& buffer)
{
GError* gerror = nullptr;
@@ -42,6 +43,6 @@ void UIManager::add_ui_separator(ui_merge_id merge_id, const Glib::ustring& path
{
gtk_ui_manager_add_ui(gobj(), merge_id, path.c_str(), name.c_str(), nullptr /* See C docs */,
((GtkUIManagerItemType)(type)), static_cast<int>(top));
}
+_DEPRECATE_IFDEF_END
} // namespace Gtk
-
diff --git a/gtk/src/uimanager.hg b/gtk/src/uimanager.hg
index 11c0764..d554899 100644
--- a/gtk/src/uimanager.hg
+++ b/gtk/src/uimanager.hg
@@ -35,7 +35,7 @@ _IS_DEPRECATED // This whole file is deprecated.
namespace Gtk
{
-_WRAP_ENUM(UIManagerItemType, GtkUIManagerItemType)
+_WRAP_ENUM(UIManagerItemType, GtkUIManagerItemType, deprecated "Because Gtk::UIManager is deprecated.")
/** Constructing menus and toolbars from an XML description.
*
@@ -195,30 +195,43 @@ public:
_WRAP_METHOD(void set_add_tearoffs(bool add_tearoffs = true), gtk_ui_manager_set_add_tearoffs, deprecated
"Tearoff menus are deprecated and should not be used in newly written code.")
_WRAP_METHOD(bool get_add_tearoffs() const, gtk_ui_manager_get_add_tearoffs, deprecated "Tearoff menus are
deprecated and should not be used in newly written code.")
- _WRAP_METHOD(void insert_action_group(const Glib::RefPtr<ActionGroup>& action_group, int pos = 0),
gtk_ui_manager_insert_action_group)
- _WRAP_METHOD(void remove_action_group(const Glib::RefPtr<ActionGroup>& action_group),
gtk_ui_manager_remove_action_group)
+ _WRAP_METHOD(void insert_action_group(const Glib::RefPtr<ActionGroup>& action_group, int pos = 0),
gtk_ui_manager_insert_action_group,
+ deprecated "Use Gio::ActionGroup and Gtk::Widget::insert_action_group() instead.")
+ _WRAP_METHOD(void remove_action_group(const Glib::RefPtr<ActionGroup>& action_group),
gtk_ui_manager_remove_action_group,
+ deprecated "Use Gio::ActionGroup and Gtk::Widget::remove_action_group() instead.")
#m4 dnl // Override the conversion in convert_gtk.m4, because the default behaviour is wrong for this method:
#m4 _CONVERSION(`GList*', `std::vector< Glib::RefPtr<ActionGroup> >',
`Glib::ListHandler<Glib::RefPtr<ActionGroup> >::list_to_vector($3, Glib::OWNERSHIP_NONE)')
- _WRAP_METHOD(std::vector< Glib::RefPtr<ActionGroup> > get_action_groups(),
gtk_ui_manager_get_action_groups)
+ _WRAP_METHOD(std::vector< Glib::RefPtr<ActionGroup> > get_action_groups(),
gtk_ui_manager_get_action_groups,
+ deprecated "Use Gtk::Widget::list_action_prefixes() and Gtk::Widget::get_action_group() instead.")
#m4 _CONVERSION(`GList*', `std::vector< Glib::RefPtr<const ActionGroup> >',
`Glib::ListHandler<Glib::RefPtr<const ActionGroup> >::list_to_vector($3, Glib::OWNERSHIP_NONE)')
- _WRAP_METHOD(std::vector< Glib::RefPtr<const ActionGroup> > get_action_groups() const,
gtk_ui_manager_get_action_groups)
+ _WRAP_METHOD(std::vector< Glib::RefPtr<const ActionGroup> > get_action_groups() const,
gtk_ui_manager_get_action_groups,
+ deprecated "Use Gtk::Widget::list_action_prefixes() and Gtk::Widget::get_action_group() instead.")
- _WRAP_METHOD(Glib::RefPtr<AccelGroup> get_accel_group(), gtk_ui_manager_get_accel_group, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const AccelGroup> get_accel_group() const, gtk_ui_manager_get_accel_group,
refreturn, constversion)
- _WRAP_METHOD(Widget* get_widget(const Glib::ustring& path), gtk_ui_manager_get_widget)
- _WRAP_METHOD(const Widget* get_widget(const Glib::ustring& path) const, gtk_ui_manager_get_widget,
constversion)
+ _WRAP_METHOD(Glib::RefPtr<AccelGroup> get_accel_group(), gtk_ui_manager_get_accel_group, refreturn,
+ deprecated "Use Gio::ActionGroup and the accelerator group on an associated Gtk::Menu instead.")
+ _WRAP_METHOD(Glib::RefPtr<const AccelGroup> get_accel_group() const, gtk_ui_manager_get_accel_group,
refreturn, constversion,
+ deprecated "Use Gio::ActionGroup and the accelerator group on an associated Gtk::Menu instead.")
+ _WRAP_METHOD(Widget* get_widget(const Glib::ustring& path), gtk_ui_manager_get_widget,
+ deprecated "Use Gtk::Builder::get_widget() instead.")
+ _WRAP_METHOD(const Widget* get_widget(const Glib::ustring& path) const, gtk_ui_manager_get_widget,
constversion,
+ deprecated "Use Gtk::Builder::get_widget() instead.")
#m4 _CONVERSION(`GSList*',`std::vector<Widget*>',`Glib::SListHandler<Widget*>::slist_to_vector($3,
Glib::OWNERSHIP_SHALLOW)')
- _WRAP_METHOD(std::vector<Widget*> get_toplevels(UIManagerItemType types), gtk_ui_manager_get_toplevels)
+ _WRAP_METHOD(std::vector<Widget*> get_toplevels(UIManagerItemType types), gtk_ui_manager_get_toplevels,
+ deprecated "There is no corresponding replacement when using Gtk::Builder.")
#m4 _CONVERSION(`GSList*',`std::vector<const Widget*>',`Glib::SListHandler<const
Widget*>::slist_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
- _WRAP_METHOD(std::vector<const Widget*> get_toplevels(UIManagerItemType types) const,
gtk_ui_manager_get_toplevels)
+ _WRAP_METHOD(std::vector<const Widget*> get_toplevels(UIManagerItemType types) const,
gtk_ui_manager_get_toplevels,
+ deprecated "There is no corresponding replacement when using Gtk::Builder.")
- _WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& path), gtk_ui_manager_get_action,
refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Action> get_action(const Glib::ustring& path) const,
gtk_ui_manager_get_action, refreturn, constversion)
+ _WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& path), gtk_ui_manager_get_action,
refreturn,
+ deprecated "There is no corresponding replacement when using Gtk::Builder.")
+ _WRAP_METHOD(Glib::RefPtr<const Action> get_action(const Glib::ustring& path) const,
gtk_ui_manager_get_action, refreturn, constversion,
+ deprecated "There is no corresponding replacement when using Gtk::Builder.")
typedef guint ui_merge_id;
+_DEPRECATE_IFDEF_START
/** Parses a string containing a UI definition and
* merges it with the current contents. An enclosing <ui>
* element is added if it is missing.
@@ -227,16 +240,22 @@ public:
* @result The merge id for the merged UI. The merge id can be used to unmerge the UI with remove_ui().
If an error occurred, the return value is 0.
* @throws exception
* @newin{2,4}
+ * @deprecated Use Gtk::Builder::add_from_string() instead.
*/
ui_merge_id add_ui_from_string(const Glib::ustring& buffer);
+_DEPRECATE_IFDEF_END
_IGNORE(gtk_ui_manager_add_ui_from_string)
- _WRAP_METHOD(ui_merge_id add_ui_from_file(const Glib::ustring& filename), gtk_ui_manager_add_ui_from_file,
errthrow)
- _WRAP_METHOD(ui_merge_id add_ui_from_resource(const Glib::ustring& resource_path),
gtk_ui_manager_add_ui_from_resource, errthrow)
+ _WRAP_METHOD(ui_merge_id add_ui_from_file(const Glib::ustring& filename), gtk_ui_manager_add_ui_from_file,
errthrow,
+ deprecated "Use Gtk::Builder::add_from_file() instead.")
+ _WRAP_METHOD(ui_merge_id add_ui_from_resource(const Glib::ustring& resource_path),
gtk_ui_manager_add_ui_from_resource, errthrow,
+ deprecated "Use Gtk::Builder::add_from_resource() instead.")
//TODO: Is top=true a good default?
- _WRAP_METHOD(void add_ui(ui_merge_id merge_id, const Glib::ustring& path, const Glib::ustring& name, const
Glib::ustring& action, UIManagerItemType type = Gtk::UI_MANAGER_AUTO, bool top = true), gtk_ui_manager_add_ui)
+ _WRAP_METHOD(void add_ui(ui_merge_id merge_id, const Glib::ustring& path, const Glib::ustring& name, const
Glib::ustring& action, UIManagerItemType type = Gtk::UI_MANAGER_AUTO, bool top = true), gtk_ui_manager_add_ui,
+ deprecated "There is no corresponding replacement when using Gtk::Builder.")
+_DEPRECATE_IFDEF_START
/** Adds a separator UI element to the current contents.
*
* If @a type is Gtk::UI_MANAGER_AUTO, GTK+ inserts a menuitem, toolitem or
@@ -254,27 +273,27 @@ public:
* @param type The type of UI element to add.
* @param top If <tt>true</tt>, the UI element is added before its siblings, otherwise it
* is added after its siblings.
+ * @deprecated There is no corresponding replacement when using Gtk::Builder.
*/
void add_ui_separator(ui_merge_id merge_id, const Glib::ustring& path, const Glib::ustring& name = "",
UIManagerItemType type = Gtk::UI_MANAGER_AUTO, bool top = true);
+_DEPRECATE_IFDEF_END
- _WRAP_METHOD(void remove_ui(ui_merge_id merge_id), gtk_ui_manager_remove_ui)
- _WRAP_METHOD(Glib::ustring get_ui() const, gtk_ui_manager_get_ui)
- _WRAP_METHOD(void ensure_update(), gtk_ui_manager_ensure_update)
- _WRAP_METHOD(ui_merge_id new_merge_id(), gtk_ui_manager_new_merge_id)
+ _WRAP_METHOD(void remove_ui(ui_merge_id merge_id), gtk_ui_manager_remove_ui, deprecated "There is no
corresponding replacement when using Gtk::Builder.")
+ _WRAP_METHOD(Glib::ustring get_ui() const, gtk_ui_manager_get_ui, deprecated "There is no corresponding
replacement when using Gtk::Builder.")
+ _WRAP_METHOD(void ensure_update(), gtk_ui_manager_ensure_update, deprecated "There is no corresponding
replacement when using Gtk::Builder.")
+ _WRAP_METHOD(ui_merge_id new_merge_id(), gtk_ui_manager_new_merge_id, deprecated "There is no
corresponding replacement when using Gtk::Builder.")
- _WRAP_SIGNAL(void add_widget(Widget* widget), add_widget)
- _WRAP_SIGNAL(void actions_changed(), actions_changed)
+ _WRAP_SIGNAL(void add_widget(Widget* widget), add_widget, deprecated "There is no corresponding
replacement when using Gtk::Builder.")
+ _WRAP_SIGNAL(void actions_changed(), actions_changed, deprecated "There is no corresponding replacement
when using Gtk::Builder.")
#m4 _CONVERSION(`GtkAction*',`const Glib::RefPtr<Action>&',`Glib::wrap($3, true)')
- _WRAP_SIGNAL(void connect_proxy(const Glib::RefPtr<Action>& action, Widget* widget), connect_proxy)
- _WRAP_SIGNAL(void disconnect_proxy(const Glib::RefPtr<Action>& action, Widget* widget), disconnect_proxy)
- _WRAP_SIGNAL(void pre_activate(const Glib::RefPtr<Action>& action), pre_activate)
- _WRAP_SIGNAL(void post_activate(const Glib::RefPtr<Action>& action), post_activate)
+ _WRAP_SIGNAL(void connect_proxy(const Glib::RefPtr<Action>& action, Widget* widget), connect_proxy,
deprecated "There is no corresponding replacement when using Gtk::Builder.")
+ _WRAP_SIGNAL(void disconnect_proxy(const Glib::RefPtr<Action>& action, Widget* widget), disconnect_proxy,
deprecated "There is no corresponding replacement when using Gtk::Builder.")
+ _WRAP_SIGNAL(void pre_activate(const Glib::RefPtr<Action>& action), pre_activate, deprecated "There is no
corresponding replacement when using Gtk::Builder.")
+ _WRAP_SIGNAL(void post_activate(const Glib::RefPtr<Action>& action), post_activate, deprecated "There is
no corresponding replacement when using Gtk::Builder.")
_WRAP_PROPERTY("add_tearoffs", bool, deprecated "Tearoff menus are deprecated and should not be used in
newly written code.")
- _WRAP_PROPERTY("ui", Glib::ustring)
-
+ _WRAP_PROPERTY("ui", Glib::ustring, deprecated "There is no corresponding replacement when using
Gtk::Builder.")
};
} // namespace Gtk
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
