[gtkmm] Relax the deprecation of Gtk::Action.

[Kjell Ahlstedt <kjellahl src gnome org>]

commit d97219e423b69d6265d45771a06b9d5546f877b5
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Sun Jul 7 19:07:25 2013 +0200

    Relax the deprecation of Gtk::Action.
    
    * gtk/src/action.[hg|ccg]: Don't deprecate the whole class and the whole
    files. Deprecate all methods, signals and properties. There are so many
    references from Activatable to Action that it's difficult to deprecate
    all of Action without deprecating all of Activatable, which would break ABI.
    Particularly tricky when building with --disable-deprecated-api.
    * gtk/src/activatable.hg: Deprecate all methods and properties.
    * gtk/src/filelist.am: Move action.hg to gtkmm_files_any_hg.

 gtk/src/action.ccg     |   10 +++
 gtk/src/action.hg      |  156 +++++++++++++++++++++++++++---------------------
 gtk/src/activatable.hg |   22 ++++----
 gtk/src/filelist.am    |    2 +-
 4 files changed, 110 insertions(+), 80 deletions(-)
---
diff --git a/gtk/src/action.ccg b/gtk/src/action.ccg
index 989f386..0fb34af 100644
--- a/gtk/src/action.ccg
+++ b/gtk/src/action.ccg
@@ -30,30 +30,40 @@ typedef Gtk::Action Action;
 namespace Gtk
 {
 
+#ifndef GTKMM_DISABLE_DEPRECATED
 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
 
+#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)
 {
   return Glib::RefPtr<Action>( new Action(name, Gtk::StockID(), label, tooltip) );
 }
+#endif //GTKMM_DISABLE_DEPRECATED
 
+#ifndef GTKMM_DISABLE_DEPRECATED
 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
 
+#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 7e6d674..1591026 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -32,7 +32,8 @@ _PINCLUDE(glibmm/private/object_p.h)
 #define GDK_DISABLE_DEPRECATION_WARNINGS 1
 #m4 _POP()
 
-_IS_DEPRECATED // This whole file is deprecated.
+//TODO: Do this when we can stop using Activatable as a base class, when we break ABI:
+//_IS_DEPRECATED // This whole file is deprecated.
 
 namespace Gtk
 {
@@ -83,9 +84,12 @@ class Action
   _IMPLEMENTS_INTERFACE(Buildable)
 
 protected:
-  /** Creates an empty action. */
+  /** Creates an empty action.
+   * @deprecated See the description of class Action.
+   */
   _CTOR_DEFAULT
 
+#ifndef GTKMM_DISABLE_DEPRECATED
   /** Creates an action with a stock ID.
    * The stock ID is used to set a default icon, text and accelerator for the
    * action.
@@ -95,9 +99,12 @@ 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 StockID& stock_id = StockID(), const Glib::ustring& label 
= Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
+#endif //GTKMM_DISABLE_DEPRECATED
 
+#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.
@@ -107,14 +114,19 @@ 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.
@@ -122,9 +134,12 @@ 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
   /** Creates an action with a stock ID.
    * The stock ID is used to set a default icon, text and accelerator for the
    * action.
@@ -136,9 +151,12 @@ 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 Gtk::StockID& stock_id, const 
Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring());
+#endif //GTKMM_DISABLE_DEPRECATED
 
+#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.
@@ -150,25 +168,27 @@ 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)
+  _WRAP_METHOD(Glib::ustring get_name() const, gtk_action_get_name, 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(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(void set_sensitive(bool sensitive = true), gtk_action_set_sensitive)
+  _WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_action_set_sensitive, 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(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(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)
+  _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.")
 
   _IGNORE(gtk_action_connect_proxy, gtk_action_disconnect_proxy) // deprecated
 
@@ -176,78 +196,78 @@ 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)
-  _WRAP_METHOD(std::vector<const Widget*> get_proxies() const, gtk_action_get_proxies)
+  _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(void connect_accelerator(), gtk_action_connect_accelerator)
-  _WRAP_METHOD(void disconnect_accelerator(), gtk_action_disconnect_accelerator)
+  _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(Glib::ustring get_accel_path() const, gtk_action_get_accel_path)
+  _WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_action_get_accel_path, deprecated "See the 
description of class Action.")
 
   /// For instance, void on_activate();
   typedef sigc::slot<void> SlotActivate;
 
-  _WRAP_SIGNAL(void activate(), "activate")
+  _WRAP_SIGNAL(void activate(), "activate", deprecated "See the description of class Action.")
 
   //Used by AccelGroup:
-  _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)
-  _WRAP_METHOD(StockID get_stock_id() const, gtk_action_get_stock_id)
-  _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)
+  _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.")
 
   //gtk_action_get_accel_closure() is too C-specific:
   _IGNORE(gtk_action_get_accel_closure)
 
-  _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)
-  _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)
+  _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.")
 
 protected:
   _IGNORE(gtk_action_block_activate_from, gtk_action_unblock_activate_from) //deprecated
 
 protected:
   //Widget-creation routines:
-  _WRAP_VFUNC(Widget* create_menu_item(), "create_menu_item")
-  _WRAP_VFUNC(Widget* create_tool_item(), "create_tool_item")
-  _WRAP_VFUNC(void connect_proxy(Widget* proxy), "connect_proxy")
-  _WRAP_VFUNC(void disconnect_proxy(Widget* proxy), "disconnect_proxy")
+  _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", deprecated "See the description of 
class Action.")
 };
 
 } // namespace Gtk
diff --git a/gtk/src/activatable.hg b/gtk/src/activatable.hg
index 62bafd6..ef921bf 100644
--- a/gtk/src/activatable.hg
+++ b/gtk/src/activatable.hg
@@ -50,20 +50,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)
-  _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_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_PROPERTY("related-action", Glib::RefPtr<Action>)
-  _WRAP_PROPERTY("use-action-appearance", bool)
+  _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.")
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
-  _WRAP_VFUNC(void update(const Glib::RefPtr<Action>& action, const Glib::ustring& property_name), update)
-  _WRAP_VFUNC(void sync_action_properties(const Glib::RefPtr<Action>& action), sync_action_properties)
+  _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, 
deprecated "See the description of class Activatable.")
 };
 
 } // namespace Gtk
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 3d8d8c2..f90e120 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -15,6 +15,7 @@ gtkmm_files_any_hg =          \
        aboutdialog.hg          \
        accelgroup.hg           \
        accellabel.hg           \
+       action.hg               \
        actionable.hg           \
        activatable.hg          \
        adjustment.hg           \
@@ -195,7 +196,6 @@ gtkmm_files_x11_hg =            \
        socket.hg
 
 gtkmm_files_deprecated_hg =    \
-       action.hg               \
        actiongroup.hg          \
        colorselection.hg       \
        fontselection.hg        \