[gtkmm] _CLASS_GTKOBJECT: Remove __REAL_* additional arguments.

[José Alburquerque <jaalburqu src gnome org>]

commit 8b3b74e4c796e16b1fac43269c60d84991d8fb8c
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Thu Dec 23 12:40:30 2010 -0500

    _CLASS_GTKOBJECT: Remove __REAL_* additional arguments.
    
    	* tools/m4/class_gtkobject.m4: Remove the use of the
    	__REAL_[CNAME|CPARENT]__ variables needed to wrap some classes in
    	gtkmm that were typedef to their base type (such as GdkWindow and
    	GdkPixmap).  These classes have been fixed in gtk+-3 thus eliminating
    	the need for the special arguments in _CLASS_GTKOBJECT.

 ChangeLog                   |   10 ++++++++++
 tools/m4/class_gtkobject.m4 |    8 +-------
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7c1d46a..9be77aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-23  José Alburquerque  <jaalburqu svn gnome org>
+
+	_CLASS_GTKOBJECT: Remove __REAL_* additional arguments.
+
+	* tools/m4/class_gtkobject.m4: Remove the use of the
+	__REAL_[CNAME|CPARENT]__ variables needed to wrap some classes in
+	gtkmm that were typedef to their base type (such as GdkWindow and
+	GdkPixmap).  These classes have been fixed in gtk+-3 thus eliminating
+	the need for the special arguments in _CLASS_GTKOBJECT.
+
 2010-12-23  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with --enable-warnings=fatal.
diff --git a/tools/m4/class_gtkobject.m4 b/tools/m4/class_gtkobject.m4
index 8737969..d3698f2 100644
--- a/tools/m4/class_gtkobject.m4
+++ b/tools/m4/class_gtkobject.m4
@@ -14,12 +14,6 @@ define(`__CPPPARENT__',`$4')
 define(`__CPARENT__',`$5')
 define(`__PCAST__',`($5*)')
 
-dnl Some C types, e.g. GdkWindow or GdkPixmap, are a typedef to their base type,
-dnl rather than the real instance type.  That is really ugly, yes.  We get around
-dnl the problem by supporting optional __REAL_* arguments to this macro.
-define(`__REAL_CNAME__',ifelse(`$6',,__CNAME__,`$6'))
-define(`__REAL_CPARENT__',ifelse(`$7',,__CPARENT__,`$7'))
-
 
 dnl
 dnl ----------------------- Constructors -------------------------
@@ -183,7 +177,7 @@ public:
   typedef __CPPNAME__ CppObjectType;
   typedef __CPPNAME__`'_Class CppClassType;
   typedef __CNAME__ BaseObjectType;
-  typedef __REAL_CNAME__`'Class BaseClassType;
+  typedef __CNAME__`'Class BaseClassType;
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
   virtual ~__CPPNAME__`'();