diff options
author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-06-21 18:03:56 -0400 |
---|---|---|
committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-06-21 18:45:39 -0400 |
commit | c767d504c5823ab580b93a5542a29121221db75a (patch) | |
tree | b647d9d215f5d086730ba373f294495f4e90cd4f /gdk | |
parent | dcef61ac44c99cefb85364bc953a78bbdfda2c5f (diff) | |
download | gtk+-c767d504c5823ab580b93a5542a29121221db75a.tar.gz |
gdkwindow: Don't bother with a return parameter for queue_antiexpose
Standard refcounting works perfectly well. Don't give us the opportunity
for more memory leaks.
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/broadway/gdkwindow-broadway.c | 3 | ||||
-rw-r--r-- | gdk/gdkoffscreenwindow.c | 3 | ||||
-rw-r--r-- | gdk/gdkwindow.c | 7 | ||||
-rw-r--r-- | gdk/gdkwindowimpl.h | 8 | ||||
-rw-r--r-- | gdk/quartz/gdkwindow-quartz.c | 3 | ||||
-rw-r--r-- | gdk/wayland/gdkwindow-wayland.c | 3 | ||||
-rw-r--r-- | gdk/win32/gdkwindow-win32.c | 6 | ||||
-rw-r--r-- | gdk/x11/gdkgeometry-x11.c | 6 | ||||
-rw-r--r-- | gdk/x11/gdkprivate-x11.h | 2 |
9 files changed, 15 insertions, 26 deletions
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c index cfc3e4bbfa..406384e06b 100644 --- a/gdk/broadway/gdkwindow-broadway.c +++ b/gdk/broadway/gdkwindow-broadway.c @@ -1495,11 +1495,10 @@ _gdk_broadway_display_after_process_all_updates (GdkDisplay *display) { } -static gboolean +static void gdk_broadway_window_queue_antiexpose (GdkWindow *window, cairo_region_t *area) { - return FALSE; } guint32 diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c index 5ee179f86d..f54d3d14ae 100644 --- a/gdk/gdkoffscreenwindow.c +++ b/gdk/gdkoffscreenwindow.c @@ -542,11 +542,10 @@ gdk_offscreen_window_get_geometry (GdkWindow *window, } } -static gboolean +static void gdk_offscreen_window_queue_antiexpose (GdkWindow *window, cairo_region_t *area) { - return FALSE; } /** diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index ad93c9ba89..556565f1c1 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -3333,7 +3333,6 @@ static void gdk_window_process_updates_internal (GdkWindow *window) { GdkWindowImplClass *impl_class; - gboolean save_region = FALSE; GdkRectangle clip_box; GdkWindow *toplevel; @@ -3375,12 +3374,12 @@ gdk_window_process_updates_internal (GdkWindow *window) cairo_region_get_extents (update_area, &clip_box); expose_region = cairo_region_copy (update_area); impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl); - save_region = impl_class->queue_antiexpose (window, update_area); + impl_class->queue_antiexpose (window, update_area); impl_class->process_updates_recurse (window, expose_region); cairo_region_destroy (expose_region); } - if (!save_region) - cairo_region_destroy (update_area); + + cairo_region_destroy (update_area); } window->in_update = FALSE; diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h index 694a244761..950db024b3 100644 --- a/gdk/gdkwindowimpl.h +++ b/gdk/gdkwindowimpl.h @@ -126,12 +126,10 @@ struct _GdkWindowImplClass /* Called before processing updates for a window. This gives the windowing * layer a chance to save the region for later use in avoiding duplicate - * exposes. The return value indicates whether the function has a saved - * the region; if the result is TRUE, then the windowing layer is responsible - * for destroying the region later. + * exposes. */ - gboolean (* queue_antiexpose) (GdkWindow *window, - cairo_region_t *update_area); + void (* queue_antiexpose) (GdkWindow *window, + cairo_region_t *update_area); /* Called to do the windowing system specific part of gdk_window_destroy(), * diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 50d6865450..fa3e65d3c9 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -2057,11 +2057,10 @@ gdk_window_quartz_set_static_gravities (GdkWindow *window, return FALSE; } -static gboolean +static void gdk_quartz_window_queue_antiexpose (GdkWindow *window, cairo_region_t *area) { - return FALSE; } static void diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 970485f67d..00cf2185ec 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -1335,11 +1335,10 @@ gdk_window_wayland_set_static_gravities (GdkWindow *window, return TRUE; } -static gboolean +static void gdk_wayland_window_queue_antiexpose (GdkWindow *window, cairo_region_t *area) { - return FALSE; } static void diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 23e1848c02..e4c93cac4e 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -3238,9 +3238,9 @@ gdk_win32_window_get_shape (GdkWindow *window) return NULL; } -static gboolean +static void _gdk_win32_window_queue_antiexpose (GdkWindow *window, - cairo_region_t *area) + cairo_region_t *area) { HRGN hrgn = cairo_region_to_hrgn (area, 0, 0); @@ -3251,8 +3251,6 @@ _gdk_win32_window_queue_antiexpose (GdkWindow *window, ValidateRgn (GDK_WINDOW_HWND (window), hrgn); DeleteObject (hrgn); - - return FALSE; } static void diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c index 3f8c8c5f15..cfcbec891a 100644 --- a/gdk/x11/gdkgeometry-x11.c +++ b/gdk/x11/gdkgeometry-x11.c @@ -212,16 +212,14 @@ gdk_window_queue (GdkWindow *window, g_queue_push_tail (display_x11->translate_queue, item); } -gboolean +void _gdk_x11_window_queue_antiexpose (GdkWindow *window, cairo_region_t *area) { GdkWindowQueueItem *item = g_new (GdkWindowQueueItem, 1); - item->antiexpose_area = area; + item->antiexpose_area = cairo_region_reference (area); gdk_window_queue (window, item); - - return TRUE; } void diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index fcd6da4202..d5f3e1d74f 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -126,7 +126,7 @@ void _gdk_x11_window_change_property (GdkWindow *window, void _gdk_x11_window_delete_property (GdkWindow *window, GdkAtom property); -gboolean _gdk_x11_window_queue_antiexpose (GdkWindow *window, +void _gdk_x11_window_queue_antiexpose (GdkWindow *window, cairo_region_t *area); void _gdk_x11_window_translate (GdkWindow *window, cairo_region_t *area, |