Properly account for floated panes while restoring maximized pane.

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

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 98234754636dd88c0dc33965070b8ffb75a4d3fb..0ad3721c5ceaba89371148f4b5fab96416115a24 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -1362,7 +1362,7 @@ void wxAuiManager::RestorePane(wxAuiPaneInfo& pane_info)
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {
         wxAuiPaneInfo& p = m_panes.Item(i);
     for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
     {
         wxAuiPaneInfo& p = m_panes.Item(i);

-        if (!p.IsToolbar())
+        if (!p.IsToolbar() && !p.IsFloating())

         {
             p.SetFlag(wxAuiPaneInfo::optionHidden,
                       p.HasFlag(wxAuiPaneInfo::savedHiddenState));
         {
             p.SetFlag(wxAuiPaneInfo::optionHidden,
                       p.HasFlag(wxAuiPaneInfo::savedHiddenState));