summaryrefslogtreecommitdiff
path: root/gdk/gdkx.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1999-10-03 22:12:41 +0000
committerOwen Taylor <otaylor@src.gnome.org>1999-10-03 22:12:41 +0000
commitf903bdf1a745021df882b4f5ba2724e7536a3c5d (patch)
tree6c6d081a42a6c650a9a366caa4222ae9e0af2fe6 /gdk/gdkx.h
parent344e8000a2d338719d6870faf4ca4e18bd2094ed (diff)
downloadgtk+-f903bdf1a745021df882b4f5ba2724e7536a3c5d.tar.gz
Fix a reference to window_private->destroyed.
Sun Oct 3 18:13:44 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_reset_shapes_recurse): Fix a reference to window_private->destroyed. * gtk/gtkplug.c (gtk_plug_realize): Fix up a direct (ugly) setting of an internal GdkWindow member to use a _slightly_ cleaner macro. * gdk/gdkprivate.h: Split GdkWindowPrivate into GdkDrawablePrivate and GdkWindowPrivate. Add extra macros for accessing GDK_DRAWABLE_ components. * *.[ch]: Massive adjustments for the above, use the new macros in a lot of places.
Diffstat (limited to 'gdk/gdkx.h')
-rw-r--r--gdk/gdkx.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/gdk/gdkx.h b/gdk/gdkx.h
index 995c9dca97..4f142bd1ef 100644
--- a/gdk/gdkx.h
+++ b/gdk/gdkx.h
@@ -33,8 +33,10 @@
#define GDK_ROOT_WINDOW() gdk_root_window
#define GDK_ROOT_PARENT() ((GdkWindow *)&gdk_root_parent)
#define GDK_DISPLAY() gdk_display
-#define GDK_WINDOW_XDISPLAY(win) (((GdkWindowPrivate*) win)->xdisplay)
-#define GDK_WINDOW_XWINDOW(win) (((GdkWindowPrivate*) win)->xwindow)
+#define GDK_DRAWABLE_XDISPLAY(win) (((GdkDrawablePrivate*) win)->xdisplay)
+#define GDK_DRAWABLE_XID(win) (((GdkDrawablePrivate*) win)->xwindow)
+#define GDK_WINDOW_XDISPLAY GDK_DRAWABLE_XDISPLAY
+#define GDK_WINDOW_XWINDOW GDK_DRAWABLE_XID
#define GDK_IMAGE_XDISPLAY(image) (((GdkImagePrivate*) image)->xdisplay)
#define GDK_IMAGE_XIMAGE(image) (((GdkImagePrivate*) image)->ximage)
#define GDK_GC_XDISPLAY(gc) (((GdkGCPrivate*) gc)->xdisplay)