[gtkmm] Avoid including deprecated stockid.h

[Murray Cumming <murrayc src gnome org>]

commit f21173fb19be67dd54bbac55f0d373e71effc11b
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 21 22:24:00 2013 +0200

    Avoid including deprecated stockid.h
    
    For non-deprecated classes with deprecated methods that take the
    (deprecated) StockID, just add a typedef instead of including
    stockid.h. The undef hack is not enough to deal with common situations.

 gtk/src/action.hg       |    3 ++-
 gtk/src/button.hg       |    4 +++-
 gtk/src/radioaction.hg  |   18 ++----------------
 gtk/src/recentaction.hg |    4 +++-
 gtk/src/statusicon.hg   |    2 +-
 gtk/src/toggleaction.hg |   18 +-----------------
 gtk/src/toolbar.hg      |    1 -
 gtk/src/widget.hg       |    3 ++-
 8 files changed, 14 insertions(+), 39 deletions(-)
---
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 9a5a632..9589d38 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -21,7 +21,7 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/widget.h>
 #include <gtkmm/accelgroup.h>
-#include <gtkmm/stockid.h>
+//Deprecated: #include <gtkmm/stockid.h>
 #include <giomm/icon.h>
 
 _DEFS(gtkmm,gtk)
@@ -43,6 +43,7 @@ class Menu;
 class MenuItem;
 class ToolItem;
 class Image;
+class StockID; //deprecated
 
 /** An action which can be triggered by a menu or toolbar item.
  *
diff --git a/gtk/src/button.hg b/gtk/src/button.hg
index 446f0a9..5276e4f 100644
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@ -18,7 +18,7 @@
 
 #include <gtkmm/bin.h>
 #include <gtkmm/activatable.h>
-#include <gtkmm/stockid.h>
+//deprecated: #include <gtkmm/stockid.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/bin_p.h)
 
@@ -30,6 +30,8 @@ _PINCLUDE(gtkmm/private/bin_p.h)
 namespace Gtk
 {
 
+class StockID; //deprecated
+
 //TODO: Derive from (and implement) Actionable when we can break ABI.
 
 /** A widget that creates a signal when clicked on.
diff --git a/gtk/src/radioaction.hg b/gtk/src/radioaction.hg
index d5bc96e..80b6f77 100644
--- a/gtk/src/radioaction.hg
+++ b/gtk/src/radioaction.hg
@@ -15,22 +15,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-// We use StockID in the (deprecated) API, so we must temporarily undef GTKMM_DISABLE_DEPRECATED.
-// Temporarily undef GTKMM_DISABLE_DEPRECATED, redefining it later if appropriate.
-#if defined(GTKMM_DISABLE_DEPRECATED) && !defined(GTKMM_GTKMM_DISABLE_DEPRECATED_UNDEFED)
-//Stop the deprecation ifdef guards around the API declarations:
-#undef GTKMM_DISABLE_DEPRECATED
-#define GTKMM_GTKMM_DISABLE_DEPRECATED_UNDEFED 1
-#endif
-
-#include <gtkmm/stockid.h>
-
-// Redefine GTKMM_DISABLE_DEPRECATED if it was defined before we temporarily undefed it:
-#if defined(GTKMM_GTKMM_DISABLE_DEPRECATED_UNDEFED)
-#define GTKMM_DISABLE_DEPRECATED 1
-#undef GTKMM_GTKMM_DISABLE_DEPRECATED_UNDEFED
-#endif
-
 #include <gtkmm/toggleaction.h>
 #include <gtkmm/radiobuttongroup.h>
 
@@ -48,6 +32,8 @@ _PINCLUDE(gtkmm/private/toggleaction_p.h)
 namespace Gtk
 {
 
+class StockID; //Deprecated.
+
 /** An action of which only one in a group can be active.
  *
  * A Gtk::RadioAction is similar to Gtk::RadioMenuItem. A number of
diff --git a/gtk/src/recentaction.hg b/gtk/src/recentaction.hg
index c287aac..1c3cecb 100644
--- a/gtk/src/recentaction.hg
+++ b/gtk/src/recentaction.hg
@@ -18,7 +18,7 @@
 #include <gtkmm/action.h>
 #include <gtkmm/recentchooser.h>
 #include <gtkmm/recentmanager.h>
-#include <gtkmm/stockid.h>
+//deprecated: #include <gtkmm/stockid.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/action_p.h)
@@ -34,6 +34,8 @@ _PINCLUDE(gtkmm/private/action_p.h)
 namespace Gtk
 {
 
+class StockID; //Deprecated.
+
 /** An action of which represents a list of recently used files.
  *
  * A Gtk::RecentAction represents a list of recently used files,
diff --git a/gtk/src/statusicon.hg b/gtk/src/statusicon.hg
index aee6a14..9ecf84a 100644
--- a/gtk/src/statusicon.hg
+++ b/gtk/src/statusicon.hg
@@ -26,7 +26,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 #m4 _POP()
 
 #include <gtkmm/image.h>
-#include <gtkmm/stockid.h>
+//Deprecated: #include <gtkmm/stockid.h>
 #include <gtkmm/menu.h>
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/types.h>
diff --git a/gtk/src/toggleaction.hg b/gtk/src/toggleaction.hg
index bbd45ca..dd1346d 100644
--- a/gtk/src/toggleaction.hg
+++ b/gtk/src/toggleaction.hg
@@ -15,23 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-// We use StockID in the (deprecated) API, so we must temporarily undef GTKMM_DISABLE_DEPRECATED.
-// Temporarily undef GTKMM_DISABLE_DEPRECATED, redefining it later if appropriate.
-#if defined(GTKMM_DISABLE_DEPRECATED) && !defined(GTKMM_GTKMM_DISABLE_DEPRECATED_UNDEFED)
-//Stop the deprecation ifdef guards around the API declarations:
-#undef GTKMM_DISABLE_DEPRECATED
-#define GTKMM_GTKMM_DISABLE_DEPRECATED_UNDEFED 1
-#endif
-
-#include <gtkmm/stockid.h>
-
-// Redefine GTKMM_DISABLE_DEPRECATED if it was defined before we temporarily undefed it:
-#if defined(GTKMM_GTKMM_DISABLE_DEPRECATED_UNDEFED)
-#define GTKMM_DISABLE_DEPRECATED 1
-#undef GTKMM_GTKMM_DISABLE_DEPRECATED_UNDEFED
-#endif
-
-
+//Deprecated: #include <gtkmm/stockid.h>
 #include <gtkmm/action.h>
 
 _DEFS(gtkmm,gtk)
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index f956775..de19b3b 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -24,7 +24,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <gtkmm/toolbutton.h>
 #include <gtkmm/toggletoolbutton.h>
 #include <gtkmm/container.h>
-#include <gtkmm/stockid.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/container_p.h)
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index a201df5..2bf044e 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -38,7 +38,7 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <gtkmm/enums.h>
 #include <gdkmm/display.h>
 #include <gtkmm/targetlist.h>
-#include <gtkmm/stockid.h>
+//#include <gtkmm/stockid.h>
 #include <gtkmm/clipboard.h>
 #include <gtkmm/requisition.h>
 #include <gtkmm/stylecontext.h>
@@ -77,6 +77,7 @@ class Window;
 class Container;
 class Settings;
 class Tooltip;
+class StockID; //deprecated.
 
 // Gtk::Allocation is a typedef of Gdk::Rectangle because GtkAllocation is
 // a typedef of GdkRectangle.