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
This commit is contained in:
parent
292d1a2fdd
commit
579b10c2be
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user