diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-07-31 18:27:00 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-07-31 18:27:00 +0000 |
| commit | 607f7ddde9624ec81cadd492c8f0c742011fe9b3 (patch) | |
| tree | d59cebc72b295f4802c296afaf3ddb4094ff68e9 /gdk/gdkwindow.c | |
| parent | 257ef68381154008064a8f0c67901a10bd70da85 (diff) | |
| download | gtk+-607f7ddde9624ec81cadd492c8f0c742011fe9b3.tar.gz | |
Added missed case into draw code. (Thanks Tim!)
Fri Jul 31 13:23:50 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): Added
missed case into draw code. (Thanks Tim!)
* gtk/gtkrc.c gtk/gtkstyle.c: When unrealizing/destroying
call engine-specific code first. Misc cleanups.
* themes/Makefile.in themes/configure.in: Fixups with
GTK_CFLAGS.
Thu Jul 30 18:09:21 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c gtk/gtkstyle.c: More mm fixups
* gtk/gtktooltips.c: Pass a widget (the window) to the
drawing function instead of the GtkTooltips.
Thu Jul 30 17:27:10 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c: Abstract out checking for shape
extension into a function.
* gtk/gtkwindow.c: Fix up gtk_window_expose()/draw().
Remove extra callls to gtk_window_draw().
Diffstat (limited to 'gdk/gdkwindow.c')
| -rw-r--r-- | gdk/gdkwindow.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index cc2fda0b64..316b7cc8dc 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1597,12 +1597,12 @@ gdk_window_shape_combine_mask (GdkWindow *window, g_return_if_fail (window != NULL); #ifdef HAVE_SHAPE_EXT + window_private = (GdkWindowPrivate*) window; + if (window_private->destroyed) + return; + if (gdk_window_have_shape_ext()) { - window_private = (GdkWindowPrivate*) window; - if (window_private->destroyed) - return; - if (mask) { GdkWindowPrivate *pixmap_private; @@ -2542,13 +2542,12 @@ gdk_window_set_child_shapes (GdkWindow *window) g_return_if_fail (window != NULL); #ifdef HAVE_SHAPE_EXT + private = (GdkWindowPrivate*) window; + if (private->destroyed) + return; + if (gdk_window_have_shape_ext()) - { - private = (GdkWindowPrivate*) window; - if (private->destroyed) - return; - gdk_propagate_shapes (private->xdisplay, private->xwindow); - } + gdk_propagate_shapes (private->xdisplay, private->xwindow); #endif } @@ -2560,12 +2559,11 @@ gdk_window_combine_child_shapes (GdkWindow *window) g_return_if_fail (window != NULL); #ifdef HAVE_SHAPE_EXT + private = (GdkWindowPrivate*) window; + if (private->destroyed) + return; + if (gdk_window_have_shape_ext()) - { - private = (GdkWindowPrivate*) window; - if (private->destroyed) - return; - gdk_propagate_combine_shapes (private->xdisplay, private->xwindow); - } + gdk_propagate_combine_shapes (private->xdisplay, private->xwindow); #endif } |