[gtkmm/gtkmm-2-22] Fix compilation errors when disabling deprecated gdkmm API.

[Murray Cumming <murrayc src gnome org>]

commit 74c2a2fcea47d2b6fb6262d983e1d9247a3c158c
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 13 16:33:08 2010 +0200

    Fix compilation errors when disabling deprecated gdkmm API.
    
    * gdk/src/rgbcmap.[hg|ccg]: Use GDKMM_DISABLE_DEPRECATED instead of
      GTKMM_DISABLE_DEPRECATED.

 ChangeLog           |    7 +++++++
 gdk/src/rgbcmap.ccg |    5 ++---
 gdk/src/rgbcmap.hg  |    7 +++----
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 107833d..118edea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-13  Murray Cumming  <murrayc murrayc com>
+
+	Fix compilation errors when disabling deprecated gdkmm API.
+
+	* gdk/src/rgbcmap.[hg|ccg]: Use GDKMM_DISABLE_DEPRECATED instead of
+  GTKMM_DISABLE_DEPRECATED.
+
 2010-09-10  Murray Cumming  <murrayc murrayc com>>
 
 	Item: Fix the build now that the functions are deprecated.
diff --git a/gdk/src/rgbcmap.ccg b/gdk/src/rgbcmap.ccg
index 89b368e..62677f2 100644
--- a/gdk/src/rgbcmap.ccg
+++ b/gdk/src/rgbcmap.ccg
@@ -24,7 +24,7 @@
 namespace Gdk
 {
 
-#ifndef GTKMM_DISABLE_DEPRECATED
+#ifndef GDKMM_DISABLE_DEPRECATED
 
 RgbCmap::RgbCmap(const Glib::ArrayHandle<guint32>& colors)
 : gobject_ (gdk_rgb_cmap_new(const_cast<guint32*>(colors.data()), colors.size()))
@@ -51,7 +51,6 @@ unsigned long RgbCmap::size() const
 	return gobject_->n_colors;
 }
 
-#endif //GTKMM_DISABLE_DEPRECATED
+#endif //GDKMM_DISABLE_DEPRECATED
 
 } // namespace Gdk
-
diff --git a/gdk/src/rgbcmap.hg b/gdk/src/rgbcmap.hg
index e4bc2d0..b1a8c0b 100644
--- a/gdk/src/rgbcmap.hg
+++ b/gdk/src/rgbcmap.hg
@@ -25,7 +25,7 @@ _DEFS(gdkmm,gdk)
 
 #include <gdkmmconfig.h>
 
-#ifndef GTKMM_DISABLE_DEPRECATED
+#ifndef GDKMM_DISABLE_DEPRECATED
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C" { typedef struct _GdkRgbCmap GdkRgbCmap; }
@@ -57,7 +57,7 @@ public:
 
   /// Provides access to the underlying C GObject.
   GdkRgbCmap*       gobj()       { return gobject_; }
-  /// Provides access to the underlying C GObject.  
+  /// Provides access to the underlying C GObject.
   const GdkRgbCmap* gobj() const { return gobject_; }
 
 protected:
@@ -71,5 +71,4 @@ private:
 
 } // namespace Gdk
 
-#endif //GTKMM_DISABLE_DEPRECATED
-
+#endif //GDKMM_DISABLE_DEPRECATED