Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Tor Lillqvist
2005-09-26 20:54:29 +00:00
committed by Tor Lillqvist
parent a7f47a40cf
commit ca488d49a1
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
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:

7
ChangeLog.pre-2-10
View File

@@ -1,3 +1,10 @@
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:

7
gdk/win32/gdkwindow-win32.c
View File

@@ -2335,7 +2335,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)
@@ -2343,6 +2344,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
{ {
@@ -2370,6 +2373,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;
} }
} }