Make sure either the window or the depth is given when creating a pixmap.

Sun Mar  1 17:40:58 1998  Owen Taylor  <owt1@cornell.edu>

	* gdk/gdkpixmap.c: Make sure either the window or
	the depth is given when creating a pixmap.

ChangeLog

+Sun Mar  1 17:40:58 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gdk/gdkpixmap.c: Make sure either the window or
+	the depth is given when creating a pixmap.
+
 Sun Mar  1 22:59:09 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkstatusbar.h: 

ChangeLog.pre-2-0

+Sun Mar  1 17:40:58 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gdk/gdkpixmap.c: Make sure either the window or
+	the depth is given when creating a pixmap.
+
 Sun Mar  1 22:59:09 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkstatusbar.h: 

ChangeLog.pre-2-10

+Sun Mar  1 17:40:58 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gdk/gdkpixmap.c: Make sure either the window or
+	the depth is given when creating a pixmap.
+
 Sun Mar  1 22:59:09 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkstatusbar.h: 

ChangeLog.pre-2-2

+Sun Mar  1 17:40:58 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gdk/gdkpixmap.c: Make sure either the window or
+	the depth is given when creating a pixmap.
+
 Sun Mar  1 22:59:09 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkstatusbar.h: 

ChangeLog.pre-2-4

+Sun Mar  1 17:40:58 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gdk/gdkpixmap.c: Make sure either the window or
+	the depth is given when creating a pixmap.
+
 Sun Mar  1 22:59:09 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkstatusbar.h: 

ChangeLog.pre-2-6

+Sun Mar  1 17:40:58 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gdk/gdkpixmap.c: Make sure either the window or
+	the depth is given when creating a pixmap.
+
 Sun Mar  1 22:59:09 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkstatusbar.h: 

ChangeLog.pre-2-8

+Sun Mar  1 17:40:58 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gdk/gdkpixmap.c: Make sure either the window or
+	the depth is given when creating a pixmap.
+
 Sun Mar  1 22:59:09 1998  Tim Janik  <timj@gimp.org>
 
 	* gtk/gtkstatusbar.h: 

gdk/gdkpixmap.c

@@ -43,6 +43,8 @@ gdk_pixmap_new (GdkWindow *window,
   GdkWindowPrivate *private;
   GdkWindowPrivate *window_private;
 
+  g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
+
   if (!window)
     window = (GdkWindow*) &gdk_root_parent;
 
@@ -132,6 +134,7 @@ gdk_pixmap_create_from_data (GdkWindow *window,
   g_return_val_if_fail (data != NULL, NULL);
   g_return_val_if_fail (fg != NULL, NULL);
   g_return_val_if_fail (bg != NULL, NULL);
+  g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
 
   if (!window)
     window = (GdkWindow*) &gdk_root_parent;
@@ -368,8 +371,7 @@ gdk_pixmap_create_from_xpm (GdkWindow  *window,
   _GdkPixmapColor *colors = NULL, *color = NULL;
   gulong index;
 
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+  g_return_val_if_fail (window != NULL, NULL);
 
   infile = fopen (filename, "rb");
   if (infile != NULL)
@@ -529,8 +531,7 @@ gdk_pixmap_create_from_xpm_d (GdkWindow  *window,
   _GdkPixmapColor *colors = NULL, *color = NULL;
   gulong index;
 
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+  g_return_val_if_fail (window != NULL, NULL);
 
   i = 0;
   buffer = data[i++];

gdk/x11/gdkpixmap-x11.c

@@ -43,6 +43,8 @@ gdk_pixmap_new (GdkWindow *window,
   GdkWindowPrivate *private;
   GdkWindowPrivate *window_private;
 
+  g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
+
   if (!window)
     window = (GdkWindow*) &gdk_root_parent;
 
@@ -132,6 +134,7 @@ gdk_pixmap_create_from_data (GdkWindow *window,
   g_return_val_if_fail (data != NULL, NULL);
   g_return_val_if_fail (fg != NULL, NULL);
   g_return_val_if_fail (bg != NULL, NULL);
+  g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
 
   if (!window)
     window = (GdkWindow*) &gdk_root_parent;
@@ -368,8 +371,7 @@ gdk_pixmap_create_from_xpm (GdkWindow  *window,
   _GdkPixmapColor *colors = NULL, *color = NULL;
   gulong index;
 
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+  g_return_val_if_fail (window != NULL, NULL);
 
   infile = fopen (filename, "rb");
   if (infile != NULL)
@@ -529,8 +531,7 @@ gdk_pixmap_create_from_xpm_d (GdkWindow  *window,
   _GdkPixmapColor *colors = NULL, *color = NULL;
   gulong index;
 
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+  g_return_val_if_fail (window != NULL, NULL);
 
   i = 0;
   buffer = data[i++];