floating pane size now restores after perspective restore

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 846fa1aba148a3232aa758c9ab7fe46fc5b74a5e..3997bf264630e5c6dbd52eb3547b8c8e14034233 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -516,10 +516,11 @@ wxAuiManager::~wxAuiManager()
     delete m_art;
 }
 
     delete m_art;
 }
 

-// Creates a floating frame for the windows
-wxAuiFloatingFrame * wxAuiManager::CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p)
+// creates a floating frame for the windows
+wxAuiFloatingFrame* wxAuiManager::CreateFloatingFrame(wxWindow* parent,
+                                                      const wxAuiPaneInfo& pane_info)

 {
 {

-    return new wxAuiFloatingFrame(parent, this, p);
+    return new wxAuiFloatingFrame(parent, this, pane_info);

 }
 
 // GetPane() looks up a wxAuiPaneInfo structure based
 }
 
 // GetPane() looks up a wxAuiPaneInfo structure based


@@ -2300,10 +2301,15 @@ void wxAuiManager::Update()
                 // and size reflect the information in wxAuiPaneInfo
                 if (p.frame->GetPosition() != p.floating_pos)
                 {
                 // and size reflect the information in wxAuiPaneInfo
                 if (p.frame->GetPosition() != p.floating_pos)
                 {

+                    p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
+                                     p.floating_size.x, p.floating_size.y,
+                                     wxSIZE_USE_EXISTING);
+                /*

                     p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
                                      wxDefaultCoord, wxDefaultCoord,
                                      wxSIZE_USE_EXISTING);
                     //p.frame->Move(p.floating_pos.x, p.floating_pos.y);
                     p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
                                      wxDefaultCoord, wxDefaultCoord,
                                      wxSIZE_USE_EXISTING);
                     //p.frame->Move(p.floating_pos.x, p.floating_pos.y);

+                */

                 }
 
                 if (p.frame->IsShown() != p.IsShown())
                 }
 
                 if (p.frame->IsShown() != p.IsShown())