AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests 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:59:31 +00:00 committed by Tor Lillqvist
parent 4401280405
commit bca0cefe1c
3 changed files with 20 additions and 1 deletions
Show Stats 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>
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>
Fix #316871, reported by Dan Winship:

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

@ -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;
}
}