Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oops, fatal MDI bug fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-06-13 19:07:26 +00:00
parent 089ec5295e
commit 21be423168
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/frame.cpp
View File

@@ -106,9 +106,12 @@ void wxFrame::Init()
m_fsStatusBarFields = 0; m_fsStatusBarFields = 0;
m_fsStatusBarHeight = 0; m_fsStatusBarHeight = 0;
m_fsToolBarHeight = 0; m_fsToolBarHeight = 0;
// m_fsMenu = 0; // m_fsMenu = 0;
m_fsIsMaximized = FALSE; m_fsIsMaximized = FALSE;
m_fsIsShowing = FALSE; m_fsIsShowing = FALSE;
// unlike (almost?) all other windows, frames are created hidden
m_isShown = FALSE;
} }
bool wxFrame::Create(wxWindow *parent, bool wxFrame::Create(wxWindow *parent,
@@ -155,9 +158,6 @@ bool wxFrame::Create(wxWindow *parent,
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
// unlike (almost?) all other windows, frames are created hidden
m_isShown = FALSE;
return TRUE; return TRUE;
} }
@@ -517,8 +517,8 @@ bool wxFrame::ShowFullScreen(bool show, long style)
m_fsIsShowing = TRUE; m_fsIsShowing = TRUE;
m_fsStyle = style; m_fsStyle = style;
wxToolBar *theToolBar = GetToolBar(); wxToolBar *theToolBar = GetToolBar();
wxStatusBar *theStatusBar = GetStatusBar(); wxStatusBar *theStatusBar = GetStatusBar();
int dummyWidth; int dummyWidth;
@@ -543,7 +543,7 @@ bool wxFrame::ShowFullScreen(bool show, long style)
{ {
m_fsStatusBarFields = theStatusBar->GetFieldsCount(); m_fsStatusBarFields = theStatusBar->GetFieldsCount();
SetStatusBar((wxStatusBar*) NULL); SetStatusBar((wxStatusBar*) NULL);
delete theStatusBar; delete theStatusBar;
} }
else else
m_fsStatusBarFields = 0; m_fsStatusBarFields = 0;
@@ -553,11 +553,11 @@ bool wxFrame::ShowFullScreen(bool show, long style)
// save the 'normal' window style // save the 'normal' window style
m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE); m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
// save the old position, width & height, maximize state // save the old position, width & height, maximize state
m_fsOldSize = GetRect(); m_fsOldSize = GetRect();
m_fsIsMaximized = IsMaximized(); m_fsIsMaximized = IsMaximized();
// decide which window style flags to turn off // decide which window style flags to turn off
LONG newStyle = m_fsOldWindowStyle; LONG newStyle = m_fsOldWindowStyle;
LONG offFlags = 0; LONG offFlags = 0;