Upport scrolling changes and mouse wheel changes.

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

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index 1ee980a2985d3ec5db7bf31f7be723387e91475e..c2c0147106706c5528dddc0a28e943a5b07ce439 100644 (file)
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -97,8 +97,10 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
     // if the frame window's max size is greater than the min size
     // then set the max size to the min size as well
     wxSize cur_max_size = GetMaxSize();
-    if (cur_max_size.x < pane.min_size.x ||
-        cur_max_size.y < pane.min_size.y)
+    if (cur_max_size.IsFullySpecified() &&
+          (cur_max_size.x < pane.min_size.x ||
+           cur_max_size.y < pane.min_size.y)
+       )
     {
         SetMaxSize(pane_min_size);
     }
@@ -157,8 +159,10 @@ void wxAuiFloatingFrame::OnSize(wxSizeEvent& event)
 void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt)
 {
     m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt);
-    if (!evt.GetVeto())
+    if (!evt.GetVeto()) {
+       m_mgr.DetachPane(m_pane_window);
         Destroy();
+    }
 }
 
 void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)