[gtk+] x11: Remove GdkDrawableImplX11

[Benjamin Otte <otte src gnome org>]

commit 88399c041c76fe30f83e06a426cf8f4961da86c5
Author: Benjamin Otte <otte redhat com>
Date:   Wed Oct 6 04:08:20 2010 +0200

    x11: Remove GdkDrawableImplX11
    
    It's not use anymore, the whole functionality has been moved to
    GdkWindowImplX11.

 gdk/Makefile.am           |    1 -
 gdk/x11/Makefile.am       |    2 -
 gdk/x11/gdkdrawable-x11.c |   53 -------------------------------------
 gdk/x11/gdkdrawable-x11.h |   64 ---------------------------------------------
 gdk/x11/gdkwindow-x11.c   |    2 +-
 gdk/x11/gdkwindow-x11.h   |    6 ++--
 6 files changed, 4 insertions(+), 124 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 9a48fe8..f4606b9 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -202,7 +202,6 @@ x11_introspection_files = 		\
 	x11/gdkdevice-xi.c		\
 	x11/gdkdisplay-x11.c		\
 	x11/gdkdnd-x11.c		\
-	x11/gdkdrawable-x11.c		\
 	x11/gdkeventsource.c		\
 	x11/gdkeventtranslator.c	\
 	x11/gdkgeometry-x11.c		\
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6344754..b6a4751 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -30,8 +30,6 @@ libgdk_x11_la_SOURCES =    	\
 	gdkdisplay-x11.c	\
 	gdkdisplay-x11.h	\
 	gdkdnd-x11.c	   	\
-	gdkdrawable-x11.c  	\
-	gdkdrawable-x11.h	\
 	gdkeventsource.c	\
 	gdkeventsource.h	\
 	gdkeventtranslator.c	\
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 7e3e810..1435fdf 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -130,7 +130,7 @@ static void        gdk_window_impl_iface_init     (GdkWindowImplIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GdkWindowImplX11,
                          gdk_window_impl_x11,
-                         GDK_TYPE_DRAWABLE_IMPL_X11,
+                         GDK_TYPE_DRAWABLE,
                          G_IMPLEMENT_INTERFACE (GDK_TYPE_WINDOW_IMPL,
                                                 gdk_window_impl_iface_init));
 
diff --git a/gdk/x11/gdkwindow-x11.h b/gdk/x11/gdkwindow-x11.h
index 77eb32b..570a957 100644
--- a/gdk/x11/gdkwindow-x11.h
+++ b/gdk/x11/gdkwindow-x11.h
@@ -27,7 +27,7 @@
 #ifndef __GDK_WINDOW_X11_H__
 #define __GDK_WINDOW_X11_H__
 
-#include <gdk/x11/gdkdrawable-x11.h>
+#include "gdk/x11/gdkprivate-x11.h"
 
 #ifdef HAVE_XDAMAGE
 #include <X11/extensions/Xdamage.h>
@@ -56,7 +56,7 @@ typedef struct _GdkXPositionInfo GdkXPositionInfo;
 
 struct _GdkWindowImplX11
 {
-  GdkDrawableImplX11 parent_instance;
+  GdkDrawable parent_instance;
 
   GdkDrawable *wrapper;
 
@@ -81,7 +81,7 @@ struct _GdkWindowImplX11
  
 struct _GdkWindowImplX11Class 
 {
-  GdkDrawableImplX11Class parent_class;
+  GdkDrawableClass parent_class;
 };
 
 struct _GdkToplevelX11