include compile support for tests on OpenVMS (part3)

[wxWidgets.git] / src / aui / floatpane.cpp

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index ab81810d615cad41a22cc9dae25d1edadefbdcb5..99e80894e387af106f6637a40d06290c47c98010 100644 (file)
--- 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...
 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();
     }
 
     m_mgr.UnInit();


@@ -146,6 +144,11 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
 
         SetClientSize(size);
     }
 
         SetClientSize(size);
     }

+
+    if (pane.IsFixed())
+    {
+        SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER);
+    }

 }
 
 wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
 }
 
 wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const


@@ -153,17 +156,12 @@ wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
     return m_owner_mgr;
 }
 
     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)
+void wxAuiFloatingFrame::OnSize(wxSizeEvent& WXUNUSED(event))

 {
     if (m_owner_mgr)
     {
 {
     if (m_owner_mgr)
     {

-        m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize());
+        m_owner_mgr->OnFloatingPaneResized(m_pane_window, GetRect());

     }
 }
 
     }
 }
 


@@ -325,7 +323,7 @@ void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event)
 // functionality to wxWidgets itself)
 bool wxAuiFloatingFrame::isMouseDown()
 {
 // functionality to wxWidgets itself)
 bool wxAuiFloatingFrame::isMouseDown()
 {

-    return wxGetMouseState().LeftDown();
+    return wxGetMouseState().LeftIsDown();

 }
 
 
 }