From c250b3fe1d6e62c9deb9e3b968ba403fbe9b4e5e Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 15 Aug 2010 03:27:30 +0200 Subject: [PATCH] gdk: Remove supports_native_bg on WindowImplIface This will not be TRUE for anything anymore, once we fix background handling. --- gdk/gdkwindow.c | 26 +------------------------- gdk/gdkwindowimpl.h | 1 - gdk/x11/gdkwindow-x11.c | 1 - 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 9fe481000..814c41177 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -3812,28 +3812,6 @@ gdk_window_clear (GdkWindow *window) width, height); } -/* TRUE if the window clears to the same pixels as a native - window clear. This means you can use the native window - clearing operation, and additionally it means any clearing - done by the native window system for you will already be right */ -static gboolean -clears_as_native (GdkWindowObject *private) -{ - GdkWindowObject *next; - - next = private; - do - { - private = next; - if (gdk_window_has_impl (private)) - return TRUE; - next = private->parent; - } - while (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && - next && next->window_type != GDK_WINDOW_ROOT); - return FALSE; -} - static void gdk_window_clear_region_internal (GdkWindow *window, cairo_region_t *region) @@ -4842,9 +4820,7 @@ gdk_window_invalidate_maybe_recurse_full (GdkWindow *window, for window backgrounds */ if (private->event_mask & GDK_EXPOSURE_MASK || clear_bg == CLEAR_BG_ALL || - (clear_bg == CLEAR_BG_WINCLEARED && - (!clears_as_native (private) || - !GDK_WINDOW_IMPL_GET_IFACE (private->impl)->supports_native_bg))) + clear_bg == CLEAR_BG_WINCLEARED) impl_window_add_update_area (impl_window, visible_region); } diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h index fcb8ba235..ac8b7ca29 100644 --- a/gdk/gdkwindowimpl.h +++ b/gdk/gdkwindowimpl.h @@ -143,7 +143,6 @@ struct _GdkWindowImplIface void (* destroy) (GdkWindow *window, gboolean recursing, gboolean foreign_destroy); - gboolean supports_native_bg; }; /* Interface Functions */ diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index a505da77e..797853289 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -5464,7 +5464,6 @@ gdk_window_impl_iface_init (GdkWindowImplIface *iface) iface->queue_antiexpose = _gdk_x11_window_queue_antiexpose; iface->translate = _gdk_x11_window_translate; iface->destroy = _gdk_x11_window_destroy; - iface->supports_native_bg = TRUE; } static Bool -- 2.43.2