remove us from the parents children list in Destroy()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index dc1a79b9167607485d131bf7a440ed58a7ac392b..7aba62adf9b6e35f55b7b3335679e059e7438cac 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -80,6 +80,19 @@ bool wxTopLevelWindowBase::Destroy()
     if ( !wxPendingDelete.Member(this) )
         wxPendingDelete.Append(this);
 
     if ( !wxPendingDelete.Member(this) )
         wxPendingDelete.Append(this);
 

+    // but hide it immediately
+    Hide();
+
+    // also remove it from the list of parents children so that the loop in
+    // wxWindowBase::DestroyChildren() eventually terminates
+    if ( m_parent )
+    {
+        m_parent->RemoveChild(this);
+
+        // don't do it again in our dtor
+        m_parent = NULL;
+    }
+

     return TRUE;
 }
 
     return TRUE;
 }