From bca0cefe1c9fb1b6946ced1c76c7df361920a535 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 26 Sep 2005 20:59:31 +0000 Subject: [PATCH] Set the shaped flag here, too. (#316871) 2005-09-26 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_shape_combine_mask): Set the shaped flag here, too. (#316871) (gdk_window_shape_combine_region): Currently unimplemented, so don't do anything to the shaped flag here. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gdk/win32/gdkwindow-win32.c | 7 ++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b9061a6183..9c8c051af4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-09-26 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.c (gdk_window_shape_combine_mask): Set + the shaped flag here, too. (#316871) + (gdk_window_shape_combine_region): Currently unimplemented, so + don't do anything to the shaped flag here. + 2005-09-26 Matthias Clasen Fix #316871, reported by Dan Winship: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b9061a6183..9c8c051af4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-09-26 Tor Lillqvist + + * gdk/win32/gdkwindow-win32.c (gdk_window_shape_combine_mask): Set + the shaped flag here, too. (#316871) + (gdk_window_shape_combine_region): Currently unimplemented, so + don't do anything to the shaped flag here. + 2005-09-26 Matthias Clasen Fix #316871, reported by Dan Winship: diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 5c2f5a095e..2eb5ba28f6 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -2363,7 +2363,8 @@ gdk_window_shape_combine_mask (GdkWindow *window, GdkBitmap *mask, gint x, gint y) { - g_return_if_fail (window != NULL); + GdkWindowObject *private = (GdkWindowObject *)window; + g_return_if_fail (GDK_IS_WINDOW (window)); if (!mask) @@ -2371,6 +2372,8 @@ gdk_window_shape_combine_mask (GdkWindow *window, GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %p: none\n", GDK_WINDOW_HWND (window))); SetWindowRgn (GDK_WINDOW_HWND (window), NULL, TRUE); + + private->shaped = FALSE; } else { @@ -2398,6 +2401,8 @@ gdk_window_shape_combine_mask (GdkWindow *window, } SetWindowRgn (GDK_WINDOW_HWND (window), hrgn, TRUE); + + private->shaped = TRUE; } }