summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-06-20 11:09:42 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-06-20 20:41:53 -0400
commita85f7028d47a39b18eb477601943b39c08147dc7 (patch)
tree612e310153e9cb518fcfbae1fab3dd46b2b698da
parent240daf55a193efd5cc83bb838a14e57ad4ce90ab (diff)
downloadgtk+-a85f7028d47a39b18eb477601943b39c08147dc7.tar.gz
gdkwindow: Deprecate gdk_window_flush
The function does nothing.
-rw-r--r--gdk/gdkwindow.c16
-rw-r--r--gdk/gdkwindow.h2
-rw-r--r--gtk/gtkmain.c7
3 files changed, 4 insertions, 21 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 70931ba858..a959f38cad 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2929,21 +2929,11 @@ gdk_window_free_paint_stack (GdkWindow *window)
* gdk_window_flush:
* @window: a #GdkWindow
*
- * Flush all outstanding cached operations on a window, leaving the
- * window in a state which reflects all that has been drawn before.
- *
- * Gdk uses multiple kinds of caching to get better performance and
- * nicer drawing. For instance, during exposes all paints to a window
- * using double buffered rendering are keep on a surface until the last
- * window has been exposed.
- *
- * Normally this should be completely invisible to applications, as
- * we automatically flush the windows when required, but this might
- * be needed if you for instance mix direct native drawing with
- * gdk drawing. For Gtk widgets that don’t use double buffering this
- * will be called automatically before sending the expose event.
+ * This function does nothing.
*
* Since: 2.18
+ *
+ * Deprecated: 3.14
**/
void
gdk_window_flush (GdkWindow *window)
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 09a4af3d2b..23a317a996 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -740,7 +740,7 @@ void gdk_window_begin_paint_region (GdkWindow *window,
const cairo_region_t *region);
GDK_AVAILABLE_IN_ALL
void gdk_window_end_paint (GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
void gdk_window_flush (GdkWindow *window);
GDK_AVAILABLE_IN_ALL
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 18d8130ae4..860c3346af 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1663,13 +1663,6 @@ gtk_main_do_event (GdkEvent *event)
}
else
{
- /* The app may paint with a previously allocated cairo_t,
- * which will draw directly to the window. We can't catch cairo
- * draw operations to automatically flush the window, thus we
- * need to explicitly flush any outstanding moves or double
- * buffering
- */
- gdk_window_flush (event->any.window);
gtk_widget_send_expose (event_widget, event);
}
break;