call RemoveChild() in ~wxWindowBase instead of doing it in each ~wxWindow for each...

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 0b0bb5ede7db21dcbd5a6236362feca4ffbdac7f..8412232abbd5678d00700965a878085b1979053d 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -281,9 +281,6 @@ wxWindow::~wxWindow()
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 

-    if(m_parent)
-        m_parent->RemoveChild(this);
-

     CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;
     CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 2961a758e940c9292b5d9f8764578432ede7445b..7c03f1178dc67753e5a3aa95c7ef811aca92292f 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -266,6 +266,17 @@ wxWindowBase::~wxWindowBase()
 
     wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
 
 
     wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
 

+    // reset the dangling pointer our parent window may keep to us
+    if ( m_parent )
+    {
+        if ( m_parent->GetDefaultItem() == this )
+        {
+            m_parent->SetDefaultItem(NULL);
+        }
+
+        m_parent->RemoveChild(this);
+    }
+

 #if wxUSE_CARET
     delete m_caret;
 #endif // wxUSE_CARET
 #if wxUSE_CARET
     delete m_caret;
 #endif // wxUSE_CARET


@@ -305,12 +316,6 @@ wxWindowBase::~wxWindowBase()
 #if wxUSE_ACCESSIBILITY
     delete m_accessible;
 #endif
 #if wxUSE_ACCESSIBILITY
     delete m_accessible;
 #endif

-
-    // reset the dangling pointer our parent window may keep to us
-    if ( m_parent && m_parent->GetDefaultItem() == this )
-    {
-        m_parent->SetDefaultItem(NULL);
-    }

 }
 
 bool wxWindowBase::Destroy()
 }
 
 bool wxWindowBase::Destroy()


@@ -343,10 +348,6 @@ bool wxWindowBase::DestroyChildren()
 
         wxWindow *child = node->GetData();
 
 
         wxWindow *child = node->GetData();
 

-        wxASSERT_MSG( child, wxT("children list contains empty nodes") );
-
-        child->Show(FALSE);
-

         child->Destroy();
 
         wxASSERT_MSG( !GetChildren().Find(child),
         child->Destroy();
 
         wxASSERT_MSG( !GetChildren().Find(child),

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 5dd7c8aabc114b4287da77eff52c17537a10d2d0..01febc0b4ad74e8d01acad2d49153b0bb2d0b704 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2667,9 +2667,6 @@ wxWindowGTK::~wxWindowGTK()
 
     DestroyChildren();
 
 
     DestroyChildren();
 

-    if (m_parent)
-        m_parent->RemoveChild( this );
-

 #ifdef HAVE_XIM
     if (m_ic)
         gdk_ic_destroy (m_ic);
 #ifdef HAVE_XIM
     if (m_ic)
         gdk_ic_destroy (m_ic);

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 5dd7c8aabc114b4287da77eff52c17537a10d2d0..01febc0b4ad74e8d01acad2d49153b0bb2d0b704 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2667,9 +2667,6 @@ wxWindowGTK::~wxWindowGTK()
 
     DestroyChildren();
 
 
     DestroyChildren();
 

-    if (m_parent)
-        m_parent->RemoveChild( this );
-

 #ifdef HAVE_XIM
     if (m_ic)
         gdk_ic_destroy (m_ic);
 #ifdef HAVE_XIM
     if (m_ic)
         gdk_ic_destroy (m_ic);

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 701f4010ecee1243c02d663d4e5ea66d88604374..86f4af777c81ab70ca481531df42f0254c529197 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -174,15 +174,8 @@ wxWindowMac::~wxWindowMac()
         gFocusWindow = NULL ;
     }
 
         gFocusWindow = NULL ;
     }
 

-       // CS: copied from MSW :
-    // VS: destroy children first and _then_ detach *this from its parent.
-    //     If we'd do it the other way around, children wouldn't be able
-    //     find their parent frame (see above).

     DestroyChildren();
 
     DestroyChildren();
 

-    if ( m_parent )
-        m_parent->RemoveChild(this);
-

     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_dropTarget != NULL )
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_dropTarget != NULL )

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 701f4010ecee1243c02d663d4e5ea66d88604374..86f4af777c81ab70ca481531df42f0254c529197 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -174,15 +174,8 @@ wxWindowMac::~wxWindowMac()
         gFocusWindow = NULL ;
     }
 
         gFocusWindow = NULL ;
     }
 

-       // CS: copied from MSW :
-    // VS: destroy children first and _then_ detach *this from its parent.
-    //     If we'd do it the other way around, children wouldn't be able
-    //     find their parent frame (see above).

     DestroyChildren();
 
     DestroyChildren();
 

-    if ( m_parent )
-        m_parent->RemoveChild(this);
-

     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_dropTarget != NULL )
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_dropTarget != NULL )

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 24d5ec98a87897e1c51d8a39801b7bd1dcff5bc6..75f3a09ffe487433251f70dc6c8d88a97f180881 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -591,14 +591,8 @@ wxWindowMGL::~wxWindowMGL()
     if ( gs_windowUnderMouse == this )
         gs_windowUnderMouse = NULL;
 
     if ( gs_windowUnderMouse == this )
         gs_windowUnderMouse = NULL;
 

-    // VS: destroy children first and _then_ detach *this from its parent.
-    //     If we'd do it the other way around, children wouldn't be able
-    //     find their parent frame (see above).

     DestroyChildren();
 
     DestroyChildren();
 

-    if ( m_parent )
-        m_parent->RemoveChild(this);
-

     if ( m_wnd )
         MGL_wmDestroyWindow(m_wnd);
 }
     if ( m_wnd )
         MGL_wmDestroyWindow(m_wnd);
 }

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 6b87a729e162e5cdc41294fffd0cd392825e6994..63b1e37a5207c060e84ba199ada944b601a9d4ab 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -374,9 +374,6 @@ wxWindow::~wxWindow()
         DetachWidget(wMain);
     }
 
         DetachWidget(wMain);
     }
 

-    if ( m_parent )
-        m_parent->RemoveChild( this );
-

     // If m_drawingArea, we're a fully-fledged window with drawing area,
     // scrollbars etc. (what wxCanvas used to be)
     if ( m_drawingArea )
     // If m_drawingArea, we're a fully-fledged window with drawing area,
     // scrollbars etc. (what wxCanvas used to be)
     if ( m_drawingArea )

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index c1be9a68602217a12291a6e170835b0785190a05..598b077b1ab17fcd8b67a32a3c99708bcf1fe708 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -520,9 +520,6 @@ wxWindowMSW::~wxWindowMSW()
     //     find their parent frame (see above).
     DestroyChildren();
 
     //     find their parent frame (see above).
     DestroyChildren();
 

-    if ( m_parent )
-        m_parent->RemoveChild(this);
-

     if ( m_hWnd )
     {
         // VZ: test temp removed to understand what really happens here
     if ( m_hWnd )
     {
         // VZ: test temp removed to understand what really happens here

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 9159d1d2956b0255fe988ae85f4d80e4a40e6b04..daea0da4e140b531771ff735ce3fac8366090f87 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -362,9 +362,6 @@ wxWindowOS2::~wxWindowOS2()
 
     DestroyChildren();
 
 
     DestroyChildren();
 

-    if (m_parent)
-        m_parent->RemoveChild(this);
-

     if (m_hWnd)
     {
         if(!::WinDestroyWindow(GetHWND()))
     if (m_hWnd)
     {
         if(!::WinDestroyWindow(GetHWND()))

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 8f9b0c337fec0d9f11c56ce9d054b4e078f213bb..2cd523c2d42a1d02c1e0d6e42ee084df16f23e41 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -348,9 +348,6 @@ wxWindowX11::~wxWindowX11()
 
     m_isBeingDeleted = TRUE;
 
 
     m_isBeingDeleted = TRUE;
 

-    if (m_parent)
-        m_parent->RemoveChild( this );
-

     DestroyChildren();
 
     if (m_clientWindow != m_mainWindow)
     DestroyChildren();
 
     if (m_clientWindow != m_mainWindow)