Ignore non-existant string selection in wxComboBox::SetValue() in read-only mode...

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

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index f98693a9d10399142f3729069af9d60b24a39916..99e80894e387af106f6637a40d06290c47c98010 100644 (file)
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -144,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


@@ -152,11 +157,11 @@ wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
 }
 
 
 }
 
 

-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());

     }
 }
 
     }
 }
 


@@ -318,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();

 }
 
 
 }