From 21be423168d580ce3d2d7bd7fdc455bafac41f07 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 13 Jun 2000 19:07:26 +0000 Subject: [PATCH] oops, fatal MDI bug fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/frame.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 0cf0c6ec99..a22b5fa354 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -106,9 +106,12 @@ void wxFrame::Init() m_fsStatusBarFields = 0; m_fsStatusBarHeight = 0; m_fsToolBarHeight = 0; -// m_fsMenu = 0; +// m_fsMenu = 0; m_fsIsMaximized = FALSE; m_fsIsShowing = FALSE; + + // unlike (almost?) all other windows, frames are created hidden + m_isShown = FALSE; } bool wxFrame::Create(wxWindow *parent, @@ -155,9 +158,6 @@ bool wxFrame::Create(wxWindow *parent, wxModelessWindows.Append(this); - // unlike (almost?) all other windows, frames are created hidden - m_isShown = FALSE; - return TRUE; } @@ -517,8 +517,8 @@ bool wxFrame::ShowFullScreen(bool show, long style) m_fsIsShowing = TRUE; m_fsStyle = style; - wxToolBar *theToolBar = GetToolBar(); - wxStatusBar *theStatusBar = GetStatusBar(); + wxToolBar *theToolBar = GetToolBar(); + wxStatusBar *theStatusBar = GetStatusBar(); int dummyWidth; @@ -543,7 +543,7 @@ bool wxFrame::ShowFullScreen(bool show, long style) { m_fsStatusBarFields = theStatusBar->GetFieldsCount(); SetStatusBar((wxStatusBar*) NULL); - delete theStatusBar; + delete theStatusBar; } else m_fsStatusBarFields = 0; @@ -553,11 +553,11 @@ bool wxFrame::ShowFullScreen(bool show, long style) // save the 'normal' window 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_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 offFlags = 0;