[gtkmm] Revert "Deprecate Gtk::ActionGroup, *Action, Activatable (sort of), UIManager."

[Murray Cumming <murrayc src gnome org>]

commit caf1165105d078a2cdc92caa14a1ebfc6724e6ef
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Oct 9 11:12:20 2013 +0200

    Revert "Deprecate Gtk::ActionGroup, *Action, Activatable (sort of), UIManager."
    
    Because we do not believe that the C API is ready to be deprecated.
    See https://mail.gnome.org/archives/gtkmm-list/2013-October/msg00003.html
    
    This reverts commit d1cfb5b5d805b2033334c8fb8845522e79333814.
    
    We should apply this commit again some time in the future.
    https://git.gnome.org/browse/gtkmm/commit/?id=d1cfb5b5d805b2033334c8fb8845522e79333814

 gtk/gtkmm/radiobuttongroup.cc |    5 -----
 gtk/gtkmm/radiobuttongroup.h  |    4 ----
 gtk/src/action.hg             |   10 ----------
 gtk/src/actiongroup.hg        |    8 --------
 gtk/src/activatable.hg        |    9 ---------
 gtk/src/radioaction.hg        |    8 --------
 gtk/src/recentaction.hg       |    7 -------
 gtk/src/toggleaction.hg       |    7 -------
 gtk/src/uimanager.hg          |    5 +----
 9 files changed, 1 insertions(+), 62 deletions(-)
---
diff --git a/gtk/gtkmm/radiobuttongroup.cc b/gtk/gtkmm/radiobuttongroup.cc
index 2cde83a..ec8f72c 100644
--- a/gtk/gtkmm/radiobuttongroup.cc
+++ b/gtk/gtkmm/radiobuttongroup.cc
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-
 #include <gtkmm/radiobuttongroup.h>
 
 #include <gtkmm/radiobutton.h>
@@ -67,7 +64,6 @@ void RadioButtonGroup::add(RadioMenuItem& item)
   group_ = gtk_radio_menu_item_get_group(item.gobj());
 }
 
-#ifndef GTKMM_DISABLE_DEPRECATED
 void RadioButtonGroup::add(const Glib::RefPtr<RadioAction>& item)
 {
   item->set_group(*this);
@@ -75,7 +71,6 @@ void RadioButtonGroup::add(const Glib::RefPtr<RadioAction>& item)
   //probably not necessary:
   group_ = gtk_radio_action_get_group(item->gobj());
 }
-#endif //GTKMM_DISABLE_DEPRECATED
 
 void RadioButtonGroup::add(RadioToolButton& item)
 {
diff --git a/gtk/gtkmm/radiobuttongroup.h b/gtk/gtkmm/radiobuttongroup.h
index b303268..2c0ed1a 100644
--- a/gtk/gtkmm/radiobuttongroup.h
+++ b/gtk/gtkmm/radiobuttongroup.h
@@ -66,11 +66,7 @@ protected:
   //      Would that anything useful other than being tidy? murrayc
   void add(RadioButton& item);
   void add(RadioMenuItem& item);
-#ifndef GTKMM_DISABLE_DEPRECATED
-  /** @deprecated Use a class that implements interface Gio::Action, such as Gio::SimpleAction, instead of 
Gtk::RadioAction.
-   */
   void add(const Glib::RefPtr<RadioAction>& item);
-#endif //GTKMM_DISABLE_DEPRECATED
   void add(RadioToolButton& item);
 
   void* operator new(std::size_t); // not implemented
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 15674e7..40636b1 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -27,14 +27,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
-//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
 {
 
@@ -73,8 +65,6 @@ class Image;
  *
  * Each action can have one or more proxy menu item, toolbar button or other proxy widgets.
  * Proxies mirror the state of the action (text label, tooltip, icon, visible, sensitive, etc), and should 
change when the action's state changes. When the proxy is activated, it should activate its action.
- *
- * @deprecated Use a class that implements interface Gio::Action, such as Gio::SimpleAction.
  */
 class Action
   : public Glib::Object,
diff --git a/gtk/src/actiongroup.hg b/gtk/src/actiongroup.hg
index a109b79..4cad9c3 100644
--- a/gtk/src/actiongroup.hg
+++ b/gtk/src/actiongroup.hg
@@ -25,18 +25,10 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
-_IS_DEPRECATED // This whole file is deprecated.
 
 namespace Gtk
 {
 
-/** @deprecated Use a class that implements interface Gio::ActionGroup, such as Gio::SimpleActionGroup.
- */
 class ActionGroup
   : public Glib::Object,
     public Buildable
diff --git a/gtk/src/activatable.hg b/gtk/src/activatable.hg
index 3d3e747..cae7e84 100644
--- a/gtk/src/activatable.hg
+++ b/gtk/src/activatable.hg
@@ -20,14 +20,6 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
-//TODO: Do this when we can stop using this as a base class elsewhere, when we break ABI:
-//_IS_DEPRECATED // This whole file is deprecated.
-
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C"
 {
@@ -43,7 +35,6 @@ namespace Gtk
  * as it is responsible for activating the related action.
  *
  * @newin{2,16}
- * @deprecated Use a class that implements interface Gio::Action, such as Gio::SimpleAction, instead of 
Gtk::Action.
  */
 class Activatable : public Glib::Interface
 {
diff --git a/gtk/src/radioaction.hg b/gtk/src/radioaction.hg
index fa517cc..082d3d3 100644
--- a/gtk/src/radioaction.hg
+++ b/gtk/src/radioaction.hg
@@ -21,12 +21,6 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/toggleaction_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
-_IS_DEPRECATED // This whole file is deprecated.
 
 namespace Gtk
 {
@@ -36,8 +30,6 @@ namespace Gtk
  * A Gtk::RadioAction is similar to Gtk::RadioMenuItem. A number of
  * radio actions can be linked together so that only one may be active
  * at any one time.
- *
- * @deprecated Use a class that implements interface Gio::Action, such as Gio::SimpleAction.
  */
 class RadioAction : public Gtk::ToggleAction
 {
diff --git a/gtk/src/recentaction.hg b/gtk/src/recentaction.hg
index 8dd094d..6430873 100644
--- a/gtk/src/recentaction.hg
+++ b/gtk/src/recentaction.hg
@@ -23,12 +23,6 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/action_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
-_IS_DEPRECATED // This whole file is deprecated.
 
 namespace Gtk
 {
@@ -46,7 +40,6 @@ namespace Gtk
  * See also the methods in the RecentChooser base class.
  *
  * @newin{2,12}
- * @deprecated Use a class that implements interface Gio::Action, such as Gio::SimpleAction.
  *
  * @ingroup RecentFiles
  */
diff --git a/gtk/src/toggleaction.hg b/gtk/src/toggleaction.hg
index af57880..1015f4c 100644
--- a/gtk/src/toggleaction.hg
+++ b/gtk/src/toggleaction.hg
@@ -20,12 +20,6 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/action_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
-_IS_DEPRECATED // This whole file is deprecated.
 
 namespace Gtk
 {
@@ -35,7 +29,6 @@ namespace Gtk
  * A Gtk::ToggleAction corresponds roughly to a Gtk::CheckMenuItem.
  * It has an "active" state specifying whether the action has been checked or not.
  *
- * @deprecated Use a class that implements interface Gio::Action, such as Gio::SimpleAction.
  */
 class ToggleAction : public Gtk::Action
 {
diff --git a/gtk/src/uimanager.hg b/gtk/src/uimanager.hg
index 35389cc..3bbf483 100644
--- a/gtk/src/uimanager.hg
+++ b/gtk/src/uimanager.hg
@@ -30,8 +30,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 #define GDK_DISABLE_DEPRECATION_WARNINGS 1
 #m4 _POP()
 
-_IS_DEPRECATED // This whole file is deprecated.
-
 namespace Gtk
 {
 
@@ -178,7 +176,6 @@ _WRAP_ENUM(UIManagerItemType, GtkUIManagerItemType)
  * The behaviour is chosen based on the "hide_if_empty" property of the action to which the submenu is 
associated.
  *
  * @newin{2,4}
- * @depreacted Use Gtk::Builder instead.
  */
 class UIManager : public Glib::Object
 {
@@ -266,7 +263,7 @@ public:
   _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_PROPERTY("add_tearoffs", bool, deprecated "Tearoff menus are deprecated and should not be used in 
newly written code.")
+  _WRAP_PROPERTY("add_tearoffs", bool)
   _WRAP_PROPERTY("ui", Glib::ustring)
 
 };