diff options
| author | Kristian Rietveld <kris@gtk.org> | 2002-04-20 14:45:28 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2002-04-20 14:45:28 +0000 |
| commit | 492aeef41c88b493269ceb6f85168d112485f9c0 (patch) | |
| tree | d9f1afe40e3b58d1b372cac23545769109de9755 /gdk | |
| parent | 24816820aa895c03b1c808910494cd8dd3103c7e (diff) | |
| download | gdk-pixbuf-492aeef41c88b493269ceb6f85168d112485f9c0.tar.gz | |
replace GDK_IS_WINDOW with GDK_IS_DRAWABLE in the assert, only check
Sat Apr 20 16:49:26 2002 Kristian Rietveld <kris@gtk.org>
* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_new): replace GDK_IS_WINDOW
with GDK_IS_DRAWABLE in the assert, only check GDK_WINDOW_DESTROYED
if window is a GdkWindow,
(gdk_bitmap_create_from_data): ditto,
(gdk_pixmap_create_from_data): ditto
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/x11/gdkpixmap-x11.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c index 78674816e..1f335f220 100644 --- a/gdk/x11/gdkpixmap-x11.c +++ b/gdk/x11/gdkpixmap-x11.c @@ -162,14 +162,14 @@ gdk_pixmap_new (GdkWindow *window, GdkColormap *cmap; gint window_depth; - g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL); + g_return_val_if_fail (window == NULL || GDK_IS_DRAWABLE (window), NULL); g_return_val_if_fail ((window != NULL) || (depth != -1), NULL); g_return_val_if_fail ((width != 0) && (height != 0), NULL); if (!window) window = _gdk_parent_root; - if (GDK_WINDOW_DESTROYED (window)) + if (GDK_IS_WINDOW (window) && GDK_WINDOW_DESTROYED (window)) return NULL; window_depth = gdk_drawable_get_depth (GDK_DRAWABLE (window)); @@ -215,12 +215,12 @@ gdk_bitmap_create_from_data (GdkWindow *window, g_return_val_if_fail (data != NULL, NULL); g_return_val_if_fail ((width != 0) && (height != 0), NULL); - g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL); + g_return_val_if_fail (window == NULL || GDK_IS_DRAWABLE (window), NULL); if (!window) window = _gdk_parent_root; - if (GDK_WINDOW_DESTROYED (window)) + if (GDK_IS_WINDOW (window) && GDK_WINDOW_DESTROYED (window)) return NULL; pixmap = g_object_new (gdk_pixmap_get_type (), NULL); @@ -256,7 +256,7 @@ gdk_pixmap_create_from_data (GdkWindow *window, GdkDrawableImplX11 *draw_impl; GdkPixmapImplX11 *pix_impl; - g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL); + g_return_val_if_fail (window == NULL || GDK_IS_DRAWABLE (window), NULL); g_return_val_if_fail (data != NULL, NULL); g_return_val_if_fail (fg != NULL, NULL); g_return_val_if_fail (bg != NULL, NULL); @@ -266,7 +266,7 @@ gdk_pixmap_create_from_data (GdkWindow *window, if (!window) window = _gdk_parent_root; - if (GDK_WINDOW_DESTROYED (window)) + if (GDK_IS_WINDOW (window) && GDK_WINDOW_DESTROYED (window)) return NULL; if (depth == -1) |