AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-29 06:51:10 +00:00
Code Issues Projects Releases Wiki Activity

gdk: Use stricter checks for begin_draw_frame()

Browse Source 
We don't support drawing on child windows, so make sure nobody tries.
This commit is contained in:
Benjamin Otte 2016-11-24 04:32:26 +01:00
parent 3414f10bad
commit ae29d4db5a
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/gdkwindow.c
View File

@ -2894,6 +2894,8 @@ gdk_window_begin_draw_frame (GdkWindow *window,
GdkDrawingContext *context; GdkDrawingContext *context;
g_return_val_if_fail (GDK_IS_WINDOW (window), NULL); g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
g_return_val_if_fail (gdk_window_has_native (window), NULL);
g_return_val_if_fail (gdk_window_is_toplevel (window), NULL);
if (window->drawing_context != NULL) if (window->drawing_context != NULL)
{ {
@ -2903,7 +2905,6 @@ gdk_window_begin_draw_frame (GdkWindow *window,
return NULL; return NULL;
} }
if (gdk_window_has_native (window) && gdk_window_is_toplevel (window))
gdk_window_begin_paint_internal (window, region); gdk_window_begin_paint_internal (window, region);
context = GDK_WINDOW_IMPL_GET_CLASS (window->impl)->create_draw_context (window, region); context = GDK_WINDOW_IMPL_GET_CLASS (window->impl)->create_draw_context (window, region);
@ -2935,17 +2936,8 @@ gdk_window_end_draw_frame (GdkWindow *window,
{ {
g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (GDK_IS_DRAWING_CONTEXT (context)); g_return_if_fail (GDK_IS_DRAWING_CONTEXT (context));
if (window->drawing_context == NULL)
{
g_critical ("The window %p has no drawing context. You must call "
"gdk_window_begin_draw_frame() before calling "
"gdk_window_end_draw_frame().", window);
return;
}
g_return_if_fail (window->drawing_context == context); g_return_if_fail (window->drawing_context == context);
if (gdk_window_has_native (window) && gdk_window_is_toplevel (window))
gdk_window_end_paint_internal (window); gdk_window_end_paint_internal (window);
window->drawing_context = NULL; window->drawing_context = NULL;