Commit bca0cefe authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist
Browse files

Set the shaped flag here, too. (#316871)

2005-09-26  Tor Lillqvist  <tml@novell.com>

	* 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.
parent 44012804
2005-09-26 Tor Lillqvist <tml@novell.com>
* 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 <mclasen@redhat.com> 2005-09-26 Matthias Clasen <mclasen@redhat.com>
Fix #316871, reported by Dan Winship: Fix #316871, reported by Dan Winship:
......
2005-09-26 Tor Lillqvist <tml@novell.com>
* 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 <mclasen@redhat.com> 2005-09-26 Matthias Clasen <mclasen@redhat.com>
Fix #316871, reported by Dan Winship: Fix #316871, reported by Dan Winship:
......
...@@ -2363,7 +2363,8 @@ gdk_window_shape_combine_mask (GdkWindow *window, ...@@ -2363,7 +2363,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
GdkBitmap *mask, GdkBitmap *mask,
gint x, gint y) gint x, gint y)
{ {
g_return_if_fail (window != NULL); GdkWindowObject *private = (GdkWindowObject *)window;
g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (GDK_IS_WINDOW (window));
if (!mask) if (!mask)
...@@ -2371,6 +2372,8 @@ gdk_window_shape_combine_mask (GdkWindow *window, ...@@ -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_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %p: none\n",
GDK_WINDOW_HWND (window))); GDK_WINDOW_HWND (window)));
SetWindowRgn (GDK_WINDOW_HWND (window), NULL, TRUE); SetWindowRgn (GDK_WINDOW_HWND (window), NULL, TRUE);
private->shaped = FALSE;
} }
else else
{ {
...@@ -2398,6 +2401,8 @@ gdk_window_shape_combine_mask (GdkWindow *window, ...@@ -2398,6 +2401,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
} }
SetWindowRgn (GDK_WINDOW_HWND (window), hrgn, TRUE); SetWindowRgn (GDK_WINDOW_HWND (window), hrgn, TRUE);
private->shaped = TRUE;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment