callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Destroy native children when recursing from a destroy on a virtual window

Browse Source 
Native descendants of a virtual children are not automatically destroyed
with the parent as if it was a native window, so we need to handle
the native recursion tracking manually in _gdk_window_destroy_hierarchy()
This commit is contained in:
Alexander Larsson 2009-02-05 09:55:39 +01:00 committed by Alexander Larsson
parent d35b723261
commit 22da9d08da
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gdk/gdkwindow.c
View File

@ -1363,6 +1363,8 @@ window_remove_filters (GdkWindow *window)
* _gdk_window_destroy_hierarchy:
* @window: a #GdkWindow
* @recursing: If TRUE, then this is being called because a parent
* was destroyed.
* @recursing_native: If TRUE, then this is being called because a native parent
* was destroyed. This generally means that the call to the
* windowing system to destroy the window can be omitted, since
* it will be destroyed as a result of the parent being destroyed.
@ -1378,6 +1380,7 @@ window_remove_filters (GdkWindow *window)
static void
_gdk_window_destroy_hierarchy (GdkWindow *window,
gboolean recursing,
gboolean recursing_native,
gboolean foreign_destroy)
{
GdkWindowObject *private;
@ -1477,7 +1480,9 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
temp_private = (GdkWindowObject*) temp_window;
if (temp_private)
_gdk_window_destroy_hierarchy (temp_window,
TRUE, foreign_destroy);
TRUE,
recursing_native || gdk_window_has_impl (private),
foreign_destroy);
}
g_list_free (children);
@ -1494,7 +1499,7 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
if (gdk_window_has_impl (private))
{
GDK_WINDOW_IMPL_GET_IFACE (private->impl)->destroy (window, recursing, foreign_destroy);
GDK_WINDOW_IMPL_GET_IFACE (private->impl)->destroy (window, recursing_native, foreign_destroy);
}
else
{
@ -1541,7 +1546,7 @@ void
_gdk_window_destroy (GdkWindow *window,
gboolean foreign_destroy)
{
_gdk_window_destroy_hierarchy (window, FALSE, foreign_destroy);
_gdk_window_destroy_hierarchy (window, FALSE, FALSE, foreign_destroy);
}
/**
@ -1559,7 +1564,7 @@ _gdk_window_destroy (GdkWindow *window,
void
gdk_window_destroy (GdkWindow *window)
{
_gdk_window_destroy_hierarchy (window, FALSE, FALSE);
_gdk_window_destroy_hierarchy (window, FALSE, FALSE, FALSE);
g_object_unref (window);
}