1 files changed, 7 insertions, 102 deletions

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index f882c35829..3df7bbbf6d 100644
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -44,111 +44,24 @@ extern "C" {
 #define GDK_PARENT_RELATIVE_BG ((GdkPixmap *)1L)
 #define GDK_NO_BG ((GdkPixmap *)2L)
 
-#define GDK_DRAWABLE_TYPE(d) (((GdkDrawablePrivate *)d)->window_type)
-#define GDK_IS_WINDOW(d) (GDK_DRAWABLE_TYPE(d) <= GDK_WINDOW_TEMP || \
-                          GDK_DRAWABLE_TYPE(d) == GDK_WINDOW_FOREIGN)
-#define GDK_IS_PIXMAP(d) (GDK_DRAWABLE_TYPE(d) == GDK_DRAWABLE_PIXMAP)
-#define GDK_DRAWABLE_DESTROYED(d) (((GdkDrawablePrivate *)d)->destroyed)
-#define GDK_DRAWABLE_P(d) ((GdkDrawablePrivate*)d)
-#define GDK_WINDOW_P(d) ((GdkWindowPrivate*)d)
-#define GDK_GC_P(d) ((GdkGCPrivate*)d)
-
-typedef struct _GdkDrawablePrivate     GdkDrawablePrivate;
-typedef struct _GdkWindowPrivate       GdkWindowPrivate;
-typedef struct _GdkImageClass	       GdkImageClass;
-typedef struct _GdkImagePrivate	       GdkImagePrivate;
-typedef struct _GdkGCPrivate	       GdkGCPrivate;
-typedef struct _GdkColormapPrivate     GdkColormapPrivate;
+#define GDK_WINDOW_TYPE(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->window_type)
+#define GDK_WINDOW_DESTROYED(d) (((GdkWindowObject*)(GDK_WINDOW (d)))->destroyed)
+
+#define gdk_window_lookup(xid)	   ((GdkWindow*) gdk_xid_table_lookup (xid))
+#define gdk_pixmap_lookup(xid)	   ((GdkPixmap*) gdk_xid_table_lookup (xid))
+#define gdk_font_lookup(xid)	   ((GdkFont*) gdk_xid_table_lookup (xid))
+
 typedef struct _GdkColorInfo           GdkColorInfo;
 typedef struct _GdkFontPrivate	       GdkFontPrivate;
 typedef struct _GdkEventFilter	       GdkEventFilter;
 typedef struct _GdkClientFilter	       GdkClientFilter;
 
-struct _GdkDrawablePrivate
-{
-  GdkDrawable drawable;
-  GdkDrawableClass *klass;
-  gpointer klass_data;
-
-  guint ref_count;
-
-  gint width;
-  gint height;
-
-  GdkColormap *colormap;
-
-  guint8 window_type;
-  guint8 depth;
-  
-  guint destroyed : 2;
-};
-
-struct _GdkWindowPrivate
-{
-  GdkDrawablePrivate drawable;
-  
-  GdkWindow *parent;
-  gint x;
-  gint y;
-  guint8 resize_count;
-  guint mapped : 1;
-  guint guffaw_gravity : 1;
-  guint input_only : 1;
-
-  gint extension_events;
-
-  GList *filters;
-  GList *children;
-
-  GdkColor bg_color;
-  GdkPixmap *bg_pixmap;
-  
-  GSList *paint_stack;
-  
-  GdkRegion *update_area;
-  guint update_freeze_count;
-};
-
-struct _GdkImageClass 
-{
-  void (*destroy)   (GdkImage    *image);
-  void (*image_put) (GdkImage	 *image,
-		     GdkDrawable *window,
-		     GdkGC	 *gc,
-		     gint	  xsrc,
-		     gint	  ysrc,
-		     gint	  xdest,
-		     gint	  ydest,
-		     gint	  width,
-		     gint	  height);
-};
-
-struct _GdkImagePrivate
-{
-  GdkImage image;
-
-  guint ref_count;
-  GdkImageClass *klass;
-};
-
 struct _GdkFontPrivate
 {
   GdkFont font;
   guint ref_count;
 };
 
-struct _GdkGCPrivate
-{
-  guint ref_count;
-  GdkGCClass *klass;
-  gpointer klass_data;
-
-  gint clip_x_origin;
-  gint clip_y_origin;
-  gint ts_x_origin;
-  gint ts_y_origin;
-};
-
 typedef enum {
   GDK_COLOR_WRITEABLE = 1 << 0
 } GdkColorInfoFlags;
@@ -159,14 +72,6 @@ struct _GdkColorInfo
   guint ref_count;
 };
 
-struct _GdkColormapPrivate
-{
-  GdkColormap colormap;
-  GdkVisual *visual;
-
-  guint ref_count;
-};
-
 struct _GdkEventFilter {
   GdkFilterFunc function;
   gpointer data;