X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8949ba7d7450bbecea6b496551f00f01b632c3d6..d169fa6aef264c5dfc300dd6666236d59f4e169a:/src/aui/floatpane.cpp

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index ab81810d61..2c4a256215 100644
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -73,11 +73,9 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
 wxAuiFloatingFrame::~wxAuiFloatingFrame()
 {
     // if we do not do this, then we can crash...
-    if(m_owner_mgr)
+    if (m_owner_mgr && m_owner_mgr->m_action_window == this)
     {
-        if(m_owner_mgr->m_action_window == this)
-            m_owner_mgr->m_action_window = NULL;
-        m_owner_mgr->UnregisterFloatingFrame(this);
+        m_owner_mgr->m_action_window = NULL;
     }
 
     m_mgr.UnInit();
@@ -146,6 +144,11 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
 
         SetClientSize(size);
     }
+    
+    if (pane.IsFixed())
+    {
+        SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER);
+    }
 }
 
 wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
@@ -153,11 +156,6 @@ wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
     return m_owner_mgr;
 }
 
-void wxAuiFloatingFrame::SetOwnerManager(wxAuiManager* owner_mgr)
-{
-    // we want to allow for NULL here to avoid crashing in dtor
-    m_owner_mgr = owner_mgr;
-}
 
 void wxAuiFloatingFrame::OnSize(wxSizeEvent& event)
 {