AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Change assert to warning with some information

Browse Source
This commit is contained in:
Alexander Larsson 2008-12-04 10:22:28 +01:00 committed by Alexander Larsson
parent 6b1d7fd53d
commit 07f76be87a
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gdk/gdkwindow.c
View File

@ -1047,7 +1047,7 @@ gdk_window_set_has_native (GdkWindow *window, gboolean has_native)
visual = gdk_drawable_get_visual (window);
old_impl = private->impl;
_gdk_window_impl_new (window, private->parent, screen, visual, GDK_EXPOSURE_MASK, NULL, 0);
_gdk_window_impl_new (window, (GdkWindow *)private->parent, screen, visual, GDK_EXPOSURE_MASK, NULL, 0);
new_impl = private->impl;
private->impl = old_impl;
@ -7252,8 +7252,21 @@ _gdk_windowing_got_event (GdkDisplay *display,
is_motion_type (event->type)))
return;
/* We should only get these events on toplevel windows */
g_assert (GDK_WINDOW_TYPE (event_private->parent) == GDK_WINDOW_ROOT);
if (GDK_WINDOW_TYPE (event_private->parent) != GDK_WINDOW_ROOT)
{
GEnumValue *event_type_value, *window_type_value;
event_type_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (GDK_TYPE_EVENT_TYPE),
event->type);
window_type_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (GDK_TYPE_WINDOW_TYPE),
event_private->window_type);
/* We should only get these events on toplevel windows */
g_warning ("got unexpected event of type %s on non-toplevel window (type %s)",
event_type_value->value_name,
window_type_value->value_name);
return;
}
gdk_event_get_coords (event, &x, &y);
pointer_window = _gdk_window_find_descendant_at (event_window, x, y,