Fix some leaks cause by removing list.DeleteContents calls.

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 74f8f798e76e5930e49b559ae13966e438e6aae8..1dda57dd33db0098efb53aa971ce3f676fdd6f64 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -148,6 +148,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {
+    WX_CLEAR_LIST(wxArtProvidersList, *sm_providers);
     wxDELETE(sm_providers);
     wxDELETE(sm_cache);
 }

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 3f7e4352a6397e329d691e7a6e51cc3424ab43c1..c34e5169320dcc99198eda94b9108a85990595c8 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -434,6 +434,7 @@ bool wxSizer::Detach( wxSizer *sizer )
         if (item->GetSizer() == sizer)
         {
             item->DetachSizer();
+            delete item;
             m_children.Erase( node );
             return true;
         }
@@ -455,6 +456,7 @@ bool wxSizer::Detach( wxWindow *window )
         if (item->GetWindow() == window)
         {
             item->GetWindow()->SetContainingSizer( NULL );
+            delete item;
             m_children.Erase( node );
             return true;
         }
@@ -481,6 +483,7 @@ bool wxSizer::Detach( int index )
     else if( item->IsWindow() )
         item->GetWindow()->SetContainingSizer( NULL );
 
+    delete item;
     m_children.Erase( node );
     return true;
 }