Now show/hide status bar in ShowFullScreen, instead of deleting it

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 5b46e6c7c6423c6d7ac9b42423397f930826fa6a..fb57117e5013024332cc4414bfbd8b3d03333689 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -523,9 +523,10 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         // Save the number of fields in the statusbar
         if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
         {
-            m_fsStatusBarFields = theStatusBar->GetFieldsCount();
-            SetStatusBar((wxStatusBar*) NULL);
-            delete theStatusBar;
+            //m_fsStatusBarFields = theStatusBar->GetFieldsCount();
+            //SetStatusBar((wxStatusBar*) NULL);
+            //delete theStatusBar;
+            theStatusBar->Show(FALSE);
         }
         else
             m_fsStatusBarFields = 0;
@@ -587,10 +588,14 @@ bool wxFrame::ShowFullScreen(bool show, long style)
             theToolBar->Show(TRUE);
         }
 
-        if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0))
+        if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR)) // && (m_fsStatusBarFields > 0))
         {
-            CreateStatusBar(m_fsStatusBarFields);
-            PositionStatusBar();
+            //CreateStatusBar(m_fsStatusBarFields);
+            if (GetStatusBar())
+            {
+                GetStatusBar()->Show(TRUE);
+                PositionStatusBar();
+            }
         }
 
         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))