[gtkmm/gtkmm-3maybe: 7/8] Action: Undeprecate some methods.

[Murray Cumming <murrayc src gnome org>]

commit 4fedf48b5c5f19d3e7e01c2753a5edee60d17397
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 28 10:43:38 2010 +0100

    Action: Undeprecate some methods.
    
    * gtk/src/action.hg: Do not deprecate connect_proxy(),
    disconnect_proxy(), block_activate_from() and unblock_activate_from(),
    because we cannot derive existing classes from Activatable (their
    replacement) until we can break ABI.
    Fixes bug #608109 (David Trowbridge)

 ChangeLog         |   10 ++++++++++
 gtk/src/action.hg |   11 +++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b11a1f4..33ffc8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-28  Murray Cumming  <murrayc murrayc com>
+
+	Action: Undeprecate some methods.
+
+	* gtk/src/action.hg: Do not deprecate connect_proxy(), 
+	disconnect_proxy(), block_activate_from() and unblock_activate_from(), 
+	because we cannot derive existing classes from Activatable (their 
+	replacement) until we can break ABI.
+	Fixes bug #608109 (David Trowbridge)
+
 2010-01-27  Murray Cumming  <murrayc murrayc com>
 
 	EntryBuffer: Actually use GtkEntryBuffer.
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 1751423..c8ebb7b 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -158,8 +158,10 @@ public:
   _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 connect_proxy(Widget& proxy), gtk_action_connect_proxy, deprecated)
-  _WRAP_METHOD(void disconnect_proxy(Widget& proxy), gtk_action_disconnect_proxy, deprecated)
+
+  //TODO: Deprecate these when we can derive the appropriate widgets from Activatable, when we can break ABI.
+  _WRAP_METHOD(void connect_proxy(Widget& proxy), gtk_action_connect_proxy)
+  _WRAP_METHOD(void disconnect_proxy(Widget& proxy), gtk_action_disconnect_proxy)
 
 #m4 dnl // This isn't in convert_gtk.m4, and the default behaviour is wrong.
 #m4 _CONVERSION(`GSList*', `Glib::SListHandle<Widget*>', `$2($3, Glib::OWNERSHIP_NONE)')
@@ -232,8 +234,9 @@ public:
 
 protected:
   //For use by child actions:
-  _WRAP_METHOD(void block_activate_from(Widget& proxy), gtk_action_block_activate_from, deprecated "Activatables are now responsible for activating the action directly so this doesnt apply anymore")
-  _WRAP_METHOD(void unblock_activate_from(Widget& proxy), gtk_action_unblock_activate_from, deprecated "Activatables are now responsible for activating the action directly so this doesnt apply anymore")
+  //TODO: Deprecate these when we can derive the appropriate widgets from Activatable, when we can break ABI.
+  _WRAP_METHOD(void block_activate_from(Widget& proxy), gtk_action_block_activate_from)
+  _WRAP_METHOD(void unblock_activate_from(Widget& proxy), gtk_action_unblock_activate_from)
 
 protected:
   //Widget-creation routines: