aui: allow m_frame to be null in wxFrameManager

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

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index 94d5bfef24e93eb0aa05584531bbaad7d7b8d8a2..b0b075e68447eb41053a0cf2764cee9525219759 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -260,6 +260,8 @@ public:
                  const wxSize& size = wxDefaultSize,
                  long style = 0);
 
+    ~wxAuiTabCtrl();
+    
 protected:
 
     void OnPaint(wxPaintEvent& evt);

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index d8e98c979a8db753cdf6aa01549004e0362349cf..acf1ee2b5154dea6250d41e91839d5545ccb2e0e 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -952,6 +952,9 @@ wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent,
     m_hover_button = NULL;
 }
 
+wxAuiTabCtrl::~wxAuiTabCtrl()
+{
+}
 
 void wxAuiTabCtrl::OnPaint(wxPaintEvent&)
 {

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 3ae027d0545f2b1a3d78f9df3469070175a24dfb..0442acdd3a9b36172687812e5ee081566ede2c54 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -486,7 +486,8 @@ wxFrameManager::wxFrameManager(wxWindow* managed_wnd, unsigned int flags)
     m_hint_wnd = NULL;
     m_flags = flags;
     m_skipping = false;
-
+    m_frame = NULL;
+    
     if (managed_wnd)
     {
         SetManagedWindow(managed_wnd);
@@ -741,7 +742,10 @@ void wxFrameManager::SetManagedWindow(wxWindow* wnd)
 // will result in a crash upon program exit
 void wxFrameManager::UnInit()
 {
-    m_frame->RemoveEventHandler(this);
+    if (m_frame)
+    {
+        m_frame->RemoveEventHandler(this);
+    }
 }
 
 // GetManagedWindow() returns the window pointer being managed