[gtkmm] Gtk::Action, Activatable: Undeprecate methods that don't use a StockID

From: Kjell Ahlstedt <kjellahl src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtkmm] Gtk::Action, Activatable: Undeprecate methods that don't use a StockID
Date: Thu, 19 Dec 2013 16:19:30 +0000 (UTC)
commit 4f9ceff86cf77815167c1fd39838079b9d089b9d
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Thu Dec 19 17:05:35 2013 +0100

    Gtk::Action, Activatable: Undeprecate methods that don't use a StockID
    
    * gtk/src/action.[hg|ccg]:
    * gtk/src/activatable.hg: Undeprecate all methods, signals and properties
    that don't use a StockID.
    * gtk/src/filelist.am: Move undeprecated classes back from
    gtkmm_files_deprecated_hg to gtkmm_files_any_hg.
    
    This was forgotten when deprecations were reverted in commit
    https://git.gnome.org/browse/gtkmm/commit/?id=caf1165105d078a2cdc92caa14a1ebfc6724e6ef

 gtk/src/action.ccg     |   25 +++++---
 gtk/src/action.hg      |  156 +++++++++++++++++++++---------------------------
 gtk/src/activatable.hg |   23 +++----
 gtk/src/filelist.am    |   12 ++--
 4 files changed, 98 insertions(+), 118 deletions(-)
---
diff --git a/gtk/src/action.ccg b/gtk/src/action.ccg
index 0fb34af..55278ed 100644
--- a/gtk/src/action.ccg
+++ b/gtk/src/action.ccg
@@ -30,40 +30,45 @@ typedef Gtk::Action Action;
 namespace Gtk
 {
 
-#ifndef GTKMM_DISABLE_DEPRECATED
+_DEPRECATE_IFDEF_START
 Action::Action(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label, const 
Glib::ustring& tooltip)
 :
   _CONSTRUCT("name", name.c_str(), "stock_id", stock_id.get_c_str(), "label", (label.empty() ? 0 : 
label.c_str()),  "tooltip", (tooltip.empty() ? 0 : tooltip.c_str()))
 {}
-#endif //GTKMM_DISABLE_DEPRECATED
+_DEPRECATE_IFDEF_END
 
-#ifndef GTKMM_DISABLE_DEPRECATED
 Action::Action(const Glib::ustring& name, const Glib::ustring& icon_name, const Glib::ustring& label, const 
Glib::ustring& tooltip)
 :
   _CONSTRUCT("name", name.c_str(), "icon_name", icon_name.c_str(), "label", (label.empty() ? 0 : 
label.c_str()),  "tooltip", (tooltip.empty() ? 0 : tooltip.c_str()))
 {}
-#endif //GTKMM_DISABLE_DEPRECATED
 
-#ifndef GTKMM_DISABLE_DEPRECATED
 Glib::RefPtr<Action> Action::create(const Glib::ustring& name, const Glib::ustring& label, const 
Glib::ustring& tooltip)
 {
+_DEPRECATE_IFDEF_START
   return Glib::RefPtr<Action>( new Action(name, Gtk::StockID(), label, tooltip) );
+#else // GTKMM_DISABLE_DEPRECATED
+  // StockID is deprecated. Can't call the constructor that takes a StockID.
+  Glib::RefPtr<Action> action(new Action());
+  action->set_name(name);
+  if (!label.empty())
+    action->set_label(label);
+  if (!tooltip.empty())
+    action->set_tooltip(tooltip);
+  return action;
+_DEPRECATE_IFDEF_END
 }
-#endif //GTKMM_DISABLE_DEPRECATED
 
-#ifndef GTKMM_DISABLE_DEPRECATED
+_DEPRECATE_IFDEF_START
 Glib::RefPtr<Action> Action::create(const Glib::ustring& name, const Gtk::StockID& stock_id, const 
Glib::ustring& label, const Glib::ustring& tooltip)
 {
   return Glib::RefPtr<Action>( new Action(name, stock_id, label, tooltip) );
 }
-#endif //GTKMM_DISABLE_DEPRECATED
+_DEPRECATE_IFDEF_END
 
-#ifndef GTKMM_DISABLE_DEPRECATED
 Glib::RefPtr<Action> Action::create_with_icon_name(const Glib::ustring& name, const Glib::ustring& 
icon_name, const Glib::ustring& label, const Glib::ustring& tooltip)
 {
   return Glib::RefPtr<Action>( new Action(name, icon_name, label, tooltip) );
 }
-#endif //GTKMM_DISABLE_DEPRECATED
 
 } // namespace Gtk
 
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 9589d38..9ede17e 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -84,11 +84,10 @@ class Action
 
 protected:
   /** Creates an empty action.
-   * @deprecated See the description of class Action.
    */
   _CTOR_DEFAULT
 
-#ifndef GTKMM_DISABLE_DEPRECATED
+_DEPRECATE_IFDEF_START
   /** Creates an action with a stock ID.
    * The stock ID is used to set a default icon, text and accelerator for the
    * action.
@@ -98,12 +97,11 @@ protected:
    *                 action.
    * @param label    The label displayed in menu items and on buttons.
    * @param tooltip  A tooltip for the action.
-   * @deprecated See the description of class Action.
+   * @deprecated Stock IDs are deprecated, so use another constructor.
    */
   explicit Action(const Glib::ustring& name, const StockID& stock_id = StockID(), const Glib::ustring& label 
= Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
-#endif //GTKMM_DISABLE_DEPRECATED
+_DEPRECATE_IFDEF_END
 
-#ifndef GTKMM_DISABLE_DEPRECATED
   /** Creates an action with an icon name.
    * The action's icon will reflect the specified icon name in the user's
    * icon theme.
@@ -113,19 +111,14 @@ protected:
    *                  action.
    * @param label     The label displayed in menu items and on buttons.
    * @param tooltip   A tooltip for the action.
-   * @deprecated See the description of class Action.
    */
   explicit Action(const Glib::ustring& name, const Glib::ustring& icon_name, const Glib::ustring& label = 
Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
-#endif //GTKMM_DISABLE_DEPRECATED
 
 public:
   //Note that gtk_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:
-  /** @deprecated See the description of class Action.
-   */
   _WRAP_CREATE()
 
-#ifndef GTKMM_DISABLE_DEPRECATED
   /** Creates an action.
    *
    * @param name    A unique name for the action.
@@ -133,12 +126,10 @@ public:
    * @param tooltip A tooltip for the action.
    *
    * @return A new Action.
-   * @deprecated See the description of class Action.
    */
   static Glib::RefPtr<Action> create(const Glib::ustring& name, const Glib::ustring& label = 
Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
-#endif //GTKMM_DISABLE_DEPRECATED
 
-#ifndef GTKMM_DISABLE_DEPRECATED
+_DEPRECATE_IFDEF_START
   /** Creates an action with a stock ID.
    * The stock ID is used to set a default icon, text and accelerator for the
    * action.
@@ -150,12 +141,11 @@ public:
    * @param tooltip  A tooltip for the action.
    *
    * @return A new Action.
-   * @deprecated See the description of class Action.
+   * @deprecated Stock IDs are deprecated, so use another create() method.
    */
   static Glib::RefPtr<Action> create(const Glib::ustring& name, const Gtk::StockID& stock_id, const 
Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
-#endif //GTKMM_DISABLE_DEPRECATED
+_DEPRECATE_IFDEF_END
 
-#ifndef GTKMM_DISABLE_DEPRECATED
   /** Create an action with an icon name.
    * The action's icon will reflect the specified icon name in the user's
    * icon theme.
@@ -167,27 +157,25 @@ public:
    * @param tooltip   A tooltip for the action.
    *
    * @return A new Action.
-   * @deprecated See the description of class Action.
    */
   static Glib::RefPtr<Action> create_with_icon_name(const Glib::ustring& name, const Glib::ustring& 
icon_name, const Glib::ustring& label, const Glib::ustring& tooltip);
-#endif //GTKMM_DISABLE_DEPRECATED
 
-  _WRAP_METHOD(Glib::ustring get_name() const, gtk_action_get_name, deprecated "See the description of class 
Action.")
+  _WRAP_METHOD(Glib::ustring get_name() const, gtk_action_get_name)
 
-  _WRAP_METHOD(bool is_sensitive() const, gtk_action_is_sensitive, deprecated "See the description of class 
Action.")
-  _WRAP_METHOD(bool get_sensitive() const, gtk_action_get_sensitive, deprecated "See the description of 
class Action.")
+  _WRAP_METHOD(bool is_sensitive() const, gtk_action_is_sensitive)
+  _WRAP_METHOD(bool get_sensitive() const, gtk_action_get_sensitive)
 
-  _WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_action_set_sensitive, deprecated "See the 
description of class Action.")
+  _WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_action_set_sensitive)
 
-  _WRAP_METHOD(bool is_visible() const, gtk_action_is_visible, deprecated "See the description of class 
Action.")
-  _WRAP_METHOD(bool get_visible() const, gtk_action_get_visible, deprecated "See the description of class 
Action.")
-  _WRAP_METHOD(void set_visible(bool visible = true), gtk_action_set_visible, deprecated "See the 
description of class Action.")
+  _WRAP_METHOD(bool is_visible() const, gtk_action_is_visible)
+  _WRAP_METHOD(bool get_visible() const, gtk_action_get_visible)
+  _WRAP_METHOD(void set_visible(bool visible = true), gtk_action_set_visible)
 
-  _WRAP_METHOD(void activate(), gtk_action_activate, deprecated "See the description of class Action.")
-  _WRAP_METHOD(Image* create_icon(IconSize icon_size), gtk_action_create_icon, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(MenuItem* create_menu_item(), gtk_action_create_menu_item, deprecated "See the description of 
class Action.")
-  _WRAP_METHOD(ToolItem* create_tool_item(), gtk_action_create_tool_item, deprecated "See the description of 
class Action.")
-  _WRAP_METHOD(Menu* create_menu(), gtk_action_create_menu, deprecated "See the description of class 
Action.")
+  _WRAP_METHOD(void activate(), gtk_action_activate)
+  _WRAP_METHOD(Image* create_icon(IconSize icon_size), gtk_action_create_icon)
+  _WRAP_METHOD(MenuItem* create_menu_item(), gtk_action_create_menu_item)
+  _WRAP_METHOD(ToolItem* create_tool_item(), gtk_action_create_tool_item)
+  _WRAP_METHOD(Menu* create_menu(), gtk_action_create_menu)
 
   _IGNORE(gtk_action_connect_proxy, gtk_action_disconnect_proxy) // deprecated
 
@@ -195,85 +183,77 @@ public:
 #m4 _CONVERSION(`GSList*', `std::vector<Widget*>', `Glib::SListHandler<Widget*>::slist_to_vector($3, 
Glib::OWNERSHIP_NONE)')
 #m4 _CONVERSION(`GSList*', `std::vector<const Widget*>', `Glib::SListHandler<const 
Widget*>::slist_to_vector($3, Glib::OWNERSHIP_NONE)')
 
-  _WRAP_METHOD(std::vector<Widget*> get_proxies(), gtk_action_get_proxies, deprecated "See the description 
of class Action.")
-  _WRAP_METHOD(std::vector<const Widget*> get_proxies() const, gtk_action_get_proxies, deprecated "See the 
description of class Action.")
+  _WRAP_METHOD(std::vector<Widget*> get_proxies(), gtk_action_get_proxies)
+  _WRAP_METHOD(std::vector<const Widget*> get_proxies() const, gtk_action_get_proxies)
 
-  _WRAP_METHOD(void connect_accelerator(), gtk_action_connect_accelerator, deprecated "See the description 
of class Action.")
-  _WRAP_METHOD(void disconnect_accelerator(), gtk_action_disconnect_accelerator, deprecated "See the 
description of class Action.")
+  _WRAP_METHOD(void connect_accelerator(), gtk_action_connect_accelerator)
+  _WRAP_METHOD(void disconnect_accelerator(), gtk_action_disconnect_accelerator)
 
-  _WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_action_get_accel_path, deprecated "See the 
description of class Action.")
+  _WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_action_get_accel_path)
 
   /// For instance, void on_activate();
   typedef sigc::slot<void> SlotActivate;
 
-  _WRAP_SIGNAL(void activate(), "activate", deprecated "See the description of class Action.")
+  _WRAP_SIGNAL(void activate(), "activate")
 
   //Used by AccelGroup:
-  _WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_action_set_accel_path, deprecated 
"See the description of class Action.")
-  _WRAP_METHOD(void set_accel_group(const Glib::RefPtr<AccelGroup>& accel_group), 
gtk_action_set_accel_group, deprecated "See the description of class Action.")
-
-  _WRAP_METHOD(void set_label(const Glib::ustring& label), gtk_action_set_label, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(Glib::ustring get_label() const, gtk_action_get_label, deprecated "See the description of 
class Action.")
-  _WRAP_METHOD(void set_short_label(const Glib::ustring& short_label), gtk_action_set_short_label, 
deprecated "See the description of class Action.")
-  _WRAP_METHOD(Glib::ustring get_short_label() const, gtk_action_get_short_label, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(void set_tooltip(const Glib::ustring& tooltip), gtk_action_set_tooltip, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(Glib::ustring get_tooltip() const, gtk_action_get_tooltip, deprecated "See the description of 
class Action.")
-  _WRAP_METHOD(void set_stock_id(const StockID& stock_id), gtk_action_set_stock_id, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(StockID get_stock_id() const, gtk_action_get_stock_id, deprecated "See the description of 
class Action.")
-  _WRAP_METHOD(void set_gicon(const Glib::RefPtr<Gio::Icon>& icon), gtk_action_set_gicon, deprecated "See 
the description of class Action.")
-  _WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_gicon(), gtk_action_get_gicon, refreturn, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(Glib::RefPtr<const Gio::Icon> get_gicon() const, gtk_action_get_gicon, refreturn, 
constversion, deprecated "See the description of class Action.")
-  _WRAP_METHOD(void set_icon_name(const Glib::ustring& icon_name), gtk_action_set_icon_name, deprecated "See 
the description of class Action.")
-  _WRAP_METHOD(Glib::ustring get_icon_name() const, gtk_action_get_icon_name, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(void set_visible_horizontal(bool visible_horizontal = true), 
gtk_action_set_visible_horizontal, deprecated "See the description of class Action.")
-  _WRAP_METHOD(bool get_visible_horizontal() const, gtk_action_get_visible_horizontal, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(void set_visible_vertical(bool visible_vertical = true), gtk_action_set_visible_vertical, 
deprecated "See the description of class Action.")
-  _WRAP_METHOD(bool get_visible_vertical() const, gtk_action_get_visible_vertical, deprecated "See the 
description of class Action.")
-  _WRAP_METHOD(void set_is_important(bool is_important = true), gtk_action_set_is_important, deprecated "See 
the description of class Action.")
-  _WRAP_METHOD(bool get_is_important() const, gtk_action_get_is_important, deprecated "See the description 
of class Action.")
-
-  _WRAP_METHOD(void set_always_show_image(bool always_show = true), gtk_action_set_always_show_image, 
deprecated "See the description of class Action.")
-  _WRAP_METHOD(bool get_always_show_image() const, gtk_action_get_always_show_image, deprecated "See the 
description of class Action.")
-
-  _WRAP_METHOD(void block_activate(), gtk_action_block_activate, deprecated "See the description of class 
Action.")
-  _WRAP_METHOD(void unblock_activate(), gtk_action_unblock_activate, deprecated "See the description of 
class Action.")
+  _WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_action_set_accel_path)
+  _WRAP_METHOD(void set_accel_group(const Glib::RefPtr<AccelGroup>& accel_group), gtk_action_set_accel_group)
+
+  _WRAP_METHOD(void set_label(const Glib::ustring& label), gtk_action_set_label)
+  _WRAP_METHOD(Glib::ustring get_label() const, gtk_action_get_label)
+  _WRAP_METHOD(void set_short_label(const Glib::ustring& short_label), gtk_action_set_short_label)
+  _WRAP_METHOD(Glib::ustring get_short_label() const, gtk_action_get_short_label)
+  _WRAP_METHOD(void set_tooltip(const Glib::ustring& tooltip), gtk_action_set_tooltip)
+  _WRAP_METHOD(Glib::ustring get_tooltip() const, gtk_action_get_tooltip)
+  _WRAP_METHOD(void set_stock_id(const StockID& stock_id), gtk_action_set_stock_id, deprecated "Use 
set_icon_name() instead.")
+  _WRAP_METHOD(StockID get_stock_id() const, gtk_action_get_stock_id, deprecated "Use get_icon_name() 
instead.")
+  _WRAP_METHOD(void set_gicon(const Glib::RefPtr<Gio::Icon>& icon), gtk_action_set_gicon)
+  _WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_gicon(), gtk_action_get_gicon, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gio::Icon> get_gicon() const, gtk_action_get_gicon, refreturn, 
constversion)
+  _WRAP_METHOD(void set_icon_name(const Glib::ustring& icon_name), gtk_action_set_icon_name)
+  _WRAP_METHOD(Glib::ustring get_icon_name() const, gtk_action_get_icon_name)
+  _WRAP_METHOD(void set_visible_horizontal(bool visible_horizontal = true), 
gtk_action_set_visible_horizontal)
+  _WRAP_METHOD(bool get_visible_horizontal() const, gtk_action_get_visible_horizontal)
+  _WRAP_METHOD(void set_visible_vertical(bool visible_vertical = true), gtk_action_set_visible_vertical)
+  _WRAP_METHOD(bool get_visible_vertical() const, gtk_action_get_visible_vertical)
+  _WRAP_METHOD(void set_is_important(bool is_important = true), gtk_action_set_is_important)
+  _WRAP_METHOD(bool get_is_important() const, gtk_action_get_is_important)
+
+  _WRAP_METHOD(void set_always_show_image(bool always_show = true), gtk_action_set_always_show_image)
+  _WRAP_METHOD(bool get_always_show_image() const, gtk_action_get_always_show_image)
+
+  _WRAP_METHOD(void block_activate(), gtk_action_block_activate)
+  _WRAP_METHOD(void unblock_activate(), gtk_action_unblock_activate)
 
   //gtk_action_get_accel_closure() is too C-specific:
   _IGNORE(gtk_action_get_accel_closure)
 
-  _WRAP_PROPERTY("name", Glib::ustring, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("label", Glib::ustring, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("short_label", Glib::ustring, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("tooltip", Glib::ustring, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("stock_id", StockID, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("gicon", Glib::RefPtr<Gio::Icon>, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("icon_name", Glib::ustring, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("visible_horizontal", bool, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("visible_vertical", bool, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("visible_overflown", bool, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("is_important", bool, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("hide_if_empty", bool, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("sensitive", bool, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("visible", bool, deprecated "See the description of class Action.")
-  _WRAP_PROPERTY("action_group", Glib::RefPtr<ActionGroup>, deprecated "See the description of class 
Action.")
-  _WRAP_PROPERTY("always-show-image", bool, deprecated "See the description of class Action.")
+  _WRAP_PROPERTY("name", Glib::ustring)
+  _WRAP_PROPERTY("label", Glib::ustring)
+  _WRAP_PROPERTY("short_label", Glib::ustring)
+  _WRAP_PROPERTY("tooltip", Glib::ustring)
+  _WRAP_PROPERTY("stock_id", StockID, deprecated "Use property_icon_name() instead.")
+  _WRAP_PROPERTY("gicon", Glib::RefPtr<Gio::Icon>)
+  _WRAP_PROPERTY("icon_name", Glib::ustring)
+  _WRAP_PROPERTY("visible_horizontal", bool)
+  _WRAP_PROPERTY("visible_vertical", bool)
+  _WRAP_PROPERTY("visible_overflown", bool)
+  _WRAP_PROPERTY("is_important", bool)
+  _WRAP_PROPERTY("hide_if_empty", bool)
+  _WRAP_PROPERTY("sensitive", bool)
+  _WRAP_PROPERTY("visible", bool)
+  _WRAP_PROPERTY("action_group", Glib::RefPtr<ActionGroup>)
+  _WRAP_PROPERTY("always-show-image", bool)
 
 protected:
   _IGNORE(gtk_action_block_activate_from, gtk_action_unblock_activate_from) //deprecated
 
 protected:
   //Widget-creation routines:
-  /** @deprecated See the description of class Action.
-   */
   _WRAP_VFUNC(Widget* create_menu_item(), "create_menu_item")
-  /** @deprecated See the description of class Action.
-   */
   _WRAP_VFUNC(Widget* create_tool_item(), "create_tool_item")
-  /** @deprecated See the description of class Action.
-   */
   _WRAP_VFUNC(void connect_proxy(Widget* proxy), "connect_proxy")
-  /** @deprecated See the description of class Action.
-   */
   _WRAP_VFUNC(void disconnect_proxy(Widget* proxy), "disconnect_proxy")
 };
 
diff --git a/gtk/src/activatable.hg b/gtk/src/activatable.hg
index 5b35360..405c726 100644
--- a/gtk/src/activatable.hg
+++ b/gtk/src/activatable.hg
@@ -49,25 +49,20 @@ 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 "See the description of class Activatable.")
-  _WRAP_METHOD(Glib::RefPtr<Action> get_related_action(), gtk_activatable_get_related_action, refreturn, 
deprecated "See the description of class Activatable.")
-  _WRAP_METHOD(Glib::RefPtr<const Action> get_related_action() const, gtk_activatable_get_related_action, 
refreturn, constversion, deprecated "See the description of class Activatable.")
-  _WRAP_METHOD(bool get_use_action_appearance() const, gtk_activatable_get_use_action_appearance, deprecated 
"See the description of class Activatable.")
-  _WRAP_METHOD(void sync_action_properties(const Glib::RefPtr<Action>& action), 
gtk_activatable_sync_action_properties, deprecated "See the description of class Activatable.")
-  _WRAP_METHOD(void set_related_action(const Glib::RefPtr<Action>& action), 
gtk_activatable_set_related_action, deprecated "See the description of class Activatable.")
-  _WRAP_METHOD(void set_use_action_appearance(bool use_appearance = true), 
gtk_activatable_set_use_action_appearance, deprecated "See the description of class Activatable.")
+  _WRAP_METHOD(void do_set_related_action(const Glib::RefPtr<Action>& action), 
gtk_activatable_do_set_related_action)
+  _WRAP_METHOD(Glib::RefPtr<Action> get_related_action(), gtk_activatable_get_related_action, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Action> get_related_action() const, gtk_activatable_get_related_action, 
refreturn, constversion)
+  _WRAP_METHOD(bool get_use_action_appearance() const, gtk_activatable_get_use_action_appearance)
+  _WRAP_METHOD(void sync_action_properties(const Glib::RefPtr<Action>& action), 
gtk_activatable_sync_action_properties)
+  _WRAP_METHOD(void set_related_action(const Glib::RefPtr<Action>& action), 
gtk_activatable_set_related_action)
+  _WRAP_METHOD(void set_use_action_appearance(bool use_appearance = true), 
gtk_activatable_set_use_action_appearance)
 
-  _WRAP_PROPERTY("related-action", Glib::RefPtr<Action>, deprecated "See the description of class 
Activatable.")
-  _WRAP_PROPERTY("use-action-appearance", bool, deprecated "See the description of class Activatable.")
+  _WRAP_PROPERTY("related-action", Glib::RefPtr<Action>)
+  _WRAP_PROPERTY("use-action-appearance", bool)
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
 #m4 _CONVERSION(`GtkAction*',`const Glib::RefPtr<Action>&',`Glib::wrap($3, true)')
-  /** @deprecated See the description of class Activatable.
-   */
   _WRAP_VFUNC(void update(const Glib::RefPtr<Action>& action, const Glib::ustring& property_name), update)
-
-  /** @deprecated See the description of class Activatable.
-   */
   _WRAP_VFUNC(void sync_action_properties(const Glib::RefPtr<Action>& action), sync_action_properties)
 };
 
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 5b0a05f..c7fb56c 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -17,6 +17,7 @@ gtkmm_files_any_hg =          \
        accellabel.hg           \
        action.hg               \
        actionable.hg           \
+       actiongroup.hg          \
        activatable.hg          \
        adjustment.hg           \
        alignment.hg            \
@@ -120,10 +121,12 @@ gtkmm_files_any_hg =              \
        printoperationpreview.hg\
        printsettings.hg        \
        progressbar.hg          \
+       radioaction.hg          \
        radiobutton.hg          \
        radiomenuitem.hg        \
        radiotoolbutton.hg      \
        range.hg                \
+       recentaction.hg         \
        recentchooser.hg        \
        recentchooserdialog.hg  \
        recentchoosermenu.hg    \
@@ -164,6 +167,7 @@ gtkmm_files_any_hg =                \
        texttag.hg              \
        texttagtable.hg         \
        textview.hg             \
+       toggleaction.hg         \
        togglebutton.hg         \
        toggletoolbutton.hg     \
        toolbar.hg              \
@@ -186,6 +190,7 @@ gtkmm_files_any_hg =                \
        treestore.hg            \
        treeview.hg             \
        treeviewcolumn.hg       \
+       uimanager.hg \
        viewport.hg             \
        volumebutton.hg         \
        widget.hg               \
@@ -203,7 +208,6 @@ gtkmm_files_x11_hg =            \
        socket.hg
 
 gtkmm_files_deprecated_hg =    \
-       actiongroup.hg          \
        colorselection.hg       \
        fontselection.hg        \
        handlebox.hg            \
@@ -216,13 +220,9 @@ gtkmm_files_deprecated_hg =        \
        iconset.hg              \
        iconsource.hg           \
        imagemenuitem.hg        \
-       radioaction.hg          \
-       recentaction.hg         \
        stockitem.hg            \
        table.hg                \
-       tearoffmenuitem.hg      \
-       toggleaction.hg         \
-       uimanager.hg
+       tearoffmenuitem.hg
 
 if HOST_WINDOWS_NATIVE
 gtkmm_files_arch_hg =
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]