Apply [ 1710684 ] Fix wxAuiNotebook memory leak

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

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 8dc1918a7f08bb4609affca66fed03b4399bc5b9..64e0d728e53b06f5ab1a97cb23271eab5cadcb2e 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -2232,6 +2232,11 @@ public:
         m_tab_ctrl_height = 20;
     }
 
         m_tab_ctrl_height = 20;
     }
 

+       ~wxTabFrame()
+       {
+               wxDELETE(m_tabs);
+       }
+

     void SetTabCtrlHeight(int h)
     {
         m_tab_ctrl_height = h;
     void SetTabCtrlHeight(int h)
     {
         m_tab_ctrl_height = h;

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index ea05d8bbd7adec74f0ecc33fd7fdcc0ac8366f38..ce4429b504d65fe0f3fdaaae2104b199fbc965c3 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -511,6 +511,14 @@ wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags)
 
 wxAuiManager::~wxAuiManager()
 {
 
 wxAuiManager::~wxAuiManager()
 {

+    int i;
+       for (i = 0; i < m_panes.Count(); i++ )
+       {
+               wxAuiPaneInfo& pinfo = m_panes.Item(i);
+               if (pinfo.window && pinfo.window->GetParent() == 0)
+                       delete pinfo.window;
+       }
+    

     delete m_art;
 }
 
     delete m_art;
 }