[gtk+] Don't update window->shaped from backends
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+] Don't update window->shaped from backends
- Date: Mon, 31 Aug 2009 13:48:59 +0000 (UTC)
commit cc5b22cc816b0af0b19e0603c1cfc0043c5d11fe
Author: Alexander Larsson <alexl redhat com>
Date: Fri Aug 28 12:03:04 2009 +0200
Don't update window->shaped from backends
This is properly updated from the main code these days and
should not be touched by the backend code.
gdk/win32/gdkwindow-win32.c | 8 --------
gdk/x11/gdkwindow-x11.c | 6 ------
2 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index b70be3c..a849e26 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -2353,8 +2353,6 @@ gdk_win32_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
{
@@ -2368,8 +2366,6 @@ gdk_win32_window_shape_combine_mask (GdkWindow *window,
hrgn = _gdk_win32_bitmap_to_hrgn (mask);
do_shape_combine_region (window, hrgn, x, y);
-
- private->shaped = TRUE;
}
}
@@ -3422,8 +3418,6 @@ gdk_win32_window_shape_combine_region (GdkWindow *window,
GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_region: %p: none\n",
GDK_WINDOW_HWND (window)));
SetWindowRgn (GDK_WINDOW_HWND (window), NULL, TRUE);
-
- private->shaped = FALSE;
}
else
{
@@ -3436,8 +3430,6 @@ gdk_win32_window_shape_combine_region (GdkWindow *window,
hrgn));
do_shape_combine_region (window, hrgn, offset_x, offset_y);
-
- private->shaped = TRUE;
}
}
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index ba9a33e..1682151 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -3425,9 +3425,6 @@ do_shape_combine_region (GdkWindow *window,
: gdk_display_supports_input_shapes (GDK_WINDOW_DISPLAY (window)))
{
if (shape == ShapeBounding)
- private->shaped = FALSE;
-
- if (shape == ShapeBounding)
{
_gdk_x11_window_tmp_unset_parent_bg (window);
_gdk_x11_window_tmp_unset_bg (window, TRUE);
@@ -3454,9 +3451,6 @@ do_shape_combine_region (GdkWindow *window,
gint n_rects = 0;
XRectangle *xrects = NULL;
- if (shape == ShapeBounding)
- private->shaped = TRUE;
-
_gdk_region_get_xrectangles (shape_region,
0, 0,
&xrects, &n_rects);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]