Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since we pass in a

2002-04-27  Anders Carlsson  <andersca@gnu.org>

	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display):
	Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
	we pass in a GdkDisplay * in the macro.

2002-04-26  Anders Carlsson  <andersca@gnu.org>

	* gdk/gdkdisplay.c: (gdk_set_default_display):
	Call _gdk_windowing_set_default_display.

	* gdk/gdkinternals.h:
	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
	New function that sets gdk_display to the default display.
	Fixes #79965

10 files changed, 106 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c01883f99..406bea472f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+	Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+	we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/gdkdisplay.c: (gdk_set_default_display):
+	Call _gdk_windowing_set_default_display.
+	
+	* gdk/gdkinternals.h:
+	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+	New function that sets gdk_display to the default display.
+	Fixes #79965
+	
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5c01883f99..406bea472f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+	Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+	we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/gdkdisplay.c: (gdk_set_default_display):
+	Call _gdk_windowing_set_default_display.
+	
+	* gdk/gdkinternals.h:
+	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+	New function that sets gdk_display to the default display.
+	Fixes #79965
+	
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5c01883f99..406bea472f 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+	Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+	we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/gdkdisplay.c: (gdk_set_default_display):
+	Call _gdk_windowing_set_default_display.
+	
+	* gdk/gdkinternals.h:
+	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+	New function that sets gdk_display to the default display.
+	Fixes #79965
+	
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5c01883f99..406bea472f 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+	Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+	we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/gdkdisplay.c: (gdk_set_default_display):
+	Call _gdk_windowing_set_default_display.
+	
+	* gdk/gdkinternals.h:
+	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+	New function that sets gdk_display to the default display.
+	Fixes #79965
+	
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5c01883f99..406bea472f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+	Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+	we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/gdkdisplay.c: (gdk_set_default_display):
+	Call _gdk_windowing_set_default_display.
+	
+	* gdk/gdkinternals.h:
+	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+	New function that sets gdk_display to the default display.
+	Fixes #79965
+	
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5c01883f99..406bea472f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+	Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+	we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+	* gdk/gdkdisplay.c: (gdk_set_default_display):
+	Call _gdk_windowing_set_default_display.
+	
+	* gdk/gdkinternals.h:
+	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+	New function that sets gdk_display to the default display.
+	Fixes #79965
+	
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 6e62364abc..6a9e9646e4 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -181,6 +181,8 @@ void
 gdk_set_default_display (GdkDisplay *display)
 {
   default_display = display;
+
+  _gdk_windowing_set_default_display (display);
 }
 
 /**
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index a97b291b15..a582b51691 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -231,6 +231,7 @@ void _gdk_cursor_destroy (GdkCursor *cursor);
 
 extern GdkArgDesc _gdk_windowing_args[];
 void         _gdk_windowing_init                   (void);
+void         _gdk_windowing_set_default_display    (GdkDisplay *display);
 
 void     _gdk_windowing_window_get_offsets      (GdkWindow  *window,
 						 gint       *x_offset,
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 43a66b7347..aeee70a001 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -107,6 +107,12 @@ _gdk_windowing_init (void)
 }
 
 void
+_gdk_windowing_set_default_display (GdkDisplay *display)
+{
+  gdk_display = GDK_DISPLAY_XDISPLAY (display);
+}
+
+void
 gdk_set_use_xshm (gboolean use_xshm)
 {
 }
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 450347c4a0..775dc4db7b 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -346,7 +346,7 @@ gdk_pixmap_foreign_new_for_display (GdkDisplay      *display,
 
   /* get information about the Pixmap to fill in the structure for
      the gdk window */
-  if (!XGetGeometry (GDK_SCREEN_XDISPLAY (display),
+  if (!XGetGeometry (GDK_DISPLAY_XDISPLAY (display),
 		     xpixmap, &root_return,
 		     &x_ret, &y_ret, &w_ret, &h_ret, &bw_ret, &depth_ret))
     return NULL;