X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00c1c94cda3a685d46bc5232fb04d7f444beff54..ac0c512d865e6236fc81882cb84cc38d09f8f0ec:/src/aui/floatpane.cpp

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index e6cc086950..1a7357f824 100644
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -36,21 +36,21 @@
 #include "wx/msw/private.h"
 #endif
 
-IMPLEMENT_CLASS( wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass )
+IMPLEMENT_CLASS(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass)
 
 wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
                 wxAuiManager* owner_mgr,
                 const wxAuiPaneInfo& pane,
                 wxWindowID id /*= wxID_ANY*/,
                 long style /*=wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
-                              wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | 
+                              wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT |
                               wxCLIP_CHILDREN
                            */)
                 : wxAuiFloatingFrameBaseClass(parent, id, wxEmptyString,
                         pane.floating_pos, pane.floating_size,
-                        style | 
+                        style |
                         (pane.HasCloseButton()?wxCLOSE_BOX:0) |
-                        (pane.HasMaximizeButton()?wxMAXIMIZE:0) |
+                        (pane.HasMaximizeButton()?wxMAXIMIZE_BOX:0) |
                         (pane.IsFixed()?0:wxRESIZE_BORDER)
                         )
 {
@@ -58,7 +58,7 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
     m_moving = false;
     m_mgr.SetManagedWindow(this);
     m_solid_drag = true;
-    
+
     // find out if the system supports solid window drag.
     // on non-msw systems, this is assumed to be the case
 #ifdef __WXMSW__
@@ -66,14 +66,15 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
     SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0);
     m_solid_drag = b ? true : false;
 #endif
-    
+
     SetExtraStyle(wxWS_EX_PROCESS_IDLE);
 }
 
 wxAuiFloatingFrame::~wxAuiFloatingFrame()
 {
     // if we do not do this, then we can crash...
-    if(m_owner_mgr && m_owner_mgr->m_action_window == this) {
+    if(m_owner_mgr && m_owner_mgr->m_action_window == this)
+    {
         m_owner_mgr->m_action_window = NULL;
     }
     m_mgr.UnInit();
@@ -91,6 +92,19 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
                     Layer(0).Row(0).Position(0);
 
     // Carry over the minimum size
+    wxSize pane_min_size = pane.window->GetMinSize();
+
+    // 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.IsFullySpecified() &&
+          (cur_max_size.x < pane.min_size.x ||
+           cur_max_size.y < pane.min_size.y)
+       )
+    {
+        SetMaxSize(pane_min_size);
+    }
+
     SetMinSize(pane.window->GetMinSize());
 
     m_mgr.AddPane(m_pane_window, contained_pane);
@@ -112,7 +126,7 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
     {
         SetSize(pane.floating_size);
     }
-        else
+    else
     {
         wxSize size = pane.best_size;
         if (size == wxDefaultSize)
@@ -122,15 +136,21 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
         if (pane.HasGripper())
         {
             if (pane.HasGripperTop())
-                size.y += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
+                size.y += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
             else
-                size.x += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
+                size.x += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
         }
 
         SetClientSize(size);
     }
 }
 
+wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
+{
+    return m_owner_mgr;
+}
+
+
 void wxAuiFloatingFrame::OnSize(wxSizeEvent& event)
 {
     m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize());
@@ -139,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)
@@ -157,8 +179,8 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
         m_moving = true;
         return;
     }
-    
-    
+
+
     wxRect win_rect = GetRect();
 
     if (win_rect == m_last_rect)
@@ -171,7 +193,7 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
         return;
     }
 
-    // skip if moving too fast to avoid massive redraws and 
+    // skip if moving too fast to avoid massive redraws and
     // jumping hint windows
     if ((abs(win_rect.x - m_last_rect.x) > 3) ||
         (abs(win_rect.y - m_last_rect.y) > 3))
@@ -192,10 +214,10 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
     }
 
     wxDirection dir = wxALL;
-    
+
     int horiz_dist = abs(win_rect.x - m_last3_rect.x);
     int vert_dist = abs(win_rect.y - m_last3_rect.y);
-    
+
     if (vert_dist >= horiz_dist)
     {
         if (win_rect.y < m_last3_rect.y)
@@ -210,7 +232,7 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
         else
             dir = wxEAST;
     }
-    
+
     m_last3_rect = m_last2_rect;
     m_last2_rect = m_last_rect;
     m_last_rect = win_rect;
@@ -226,7 +248,7 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
 
     if (m_last3_rect.IsEmpty())
         return;
-        
+
     OnMoving(event.GetRect(), dir);
 }
 
@@ -239,7 +261,7 @@ void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event)
             m_moving = false;
             OnMoveFinished();
         }
-         else
+        else
         {
             event.RequestMore();
         }