change this to be GDK_DRAWABLE_XID. In the future, we probably want toJUNE_20_2000_MERGE_TO_HEADgdk-object-with-pango

2000-06-19  Havoc Pennington  <hp@redhat.com>

* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
GDK_DRAWABLE_XID. In the future, we probably want to make it
faster with G_DISABLE_CHECKS turned on.

8 files changed, 43 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index aeeba9f441..3868a89298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-19  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
+	GDK_DRAWABLE_XID. In the future, we probably want to make it
+	faster with G_DISABLE_CHECKS turned on.
+
 2000-06-14  Havoc Pennington  <hp@redhat.com>
 
         * gdk/Makefile.am: add gdkpixmap.c
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index aeeba9f441..3868a89298 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2000-06-19  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
+	GDK_DRAWABLE_XID. In the future, we probably want to make it
+	faster with G_DISABLE_CHECKS turned on.
+
 2000-06-14  Havoc Pennington  <hp@redhat.com>
 
         * gdk/Makefile.am: add gdkpixmap.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index aeeba9f441..3868a89298 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2000-06-19  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
+	GDK_DRAWABLE_XID. In the future, we probably want to make it
+	faster with G_DISABLE_CHECKS turned on.
+
 2000-06-14  Havoc Pennington  <hp@redhat.com>
 
         * gdk/Makefile.am: add gdkpixmap.c
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index aeeba9f441..3868a89298 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2000-06-19  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
+	GDK_DRAWABLE_XID. In the future, we probably want to make it
+	faster with G_DISABLE_CHECKS turned on.
+
 2000-06-14  Havoc Pennington  <hp@redhat.com>
 
         * gdk/Makefile.am: add gdkpixmap.c
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index aeeba9f441..3868a89298 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2000-06-19  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
+	GDK_DRAWABLE_XID. In the future, we probably want to make it
+	faster with G_DISABLE_CHECKS turned on.
+
 2000-06-14  Havoc Pennington  <hp@redhat.com>
 
         * gdk/Makefile.am: add gdkpixmap.c
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index aeeba9f441..3868a89298 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2000-06-19  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
+	GDK_DRAWABLE_XID. In the future, we probably want to make it
+	faster with G_DISABLE_CHECKS turned on.
+
 2000-06-14  Havoc Pennington  <hp@redhat.com>
 
         * gdk/Makefile.am: add gdkpixmap.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index aeeba9f441..3868a89298 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2000-06-19  Havoc Pennington  <hp@redhat.com>
+
+	* gdk/x11/gdkx.h (GDK_WINDOW_XWINDOW): change this to be
+	GDK_DRAWABLE_XID. In the future, we probably want to make it
+	faster with G_DISABLE_CHECKS turned on.
+
 2000-06-14  Havoc Pennington  <hp@redhat.com>
 
         * gdk/Makefile.am: add gdkpixmap.c
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index e95d983111..e94b44166e 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -150,7 +150,7 @@ GType gdk_gc_x11_get_type (void);
 
 #define GDK_GC_XGC(gc)       (GDK_GC_X11(gc)->xgc)
 #define GDK_GC_GET_XGC(gc)   (GDK_GC_X11(gc)->dirty_mask ? _gdk_x11_gc_flush (gc) : GDK_GC_XGC (gc))
-#define GDK_WINDOW_XWINDOW    GDK_WINDOW_XID
+#define GDK_WINDOW_XWINDOW    GDK_DRAWABLE_XID
 
 extern Display		*gdk_display;
 extern Window		 gdk_root_window;