fix for BSD compilation

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index abb54f3ef5f644517c49d47d9d94d156e9eaafaf..b6519a0f9566f2a1cf03d16fc01b782545ced62b 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -109,14 +109,10 @@ void wxFrameMSW::Init()
 #endif
 
     // Data to save/restore when calling ShowFullScreen
 #endif
 
     // Data to save/restore when calling ShowFullScreen

-    m_fsStyle = 0;
-    m_fsOldWindowStyle = 0;

     m_fsStatusBarFields = 0;
     m_fsStatusBarHeight = 0;
     m_fsToolBarHeight = 0;
 //  m_fsMenu = 0;
     m_fsStatusBarFields = 0;
     m_fsStatusBarHeight = 0;
     m_fsToolBarHeight = 0;
 //  m_fsMenu = 0;

-    m_fsIsMaximized = FALSE;
-    m_fsIsShowing = FALSE;

 
     m_winLastFocused = (wxWindow *)NULL;
 }
 
     m_winLastFocused = (wxWindow *)NULL;
 }


@@ -231,17 +227,6 @@ wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number,
         statusBar = new wxStatusBar(this, id, style, name);
     }
 
         statusBar = new wxStatusBar(this, id, style, name);
     }
 

-    // Set the height according to the font and the border size
-    wxClientDC dc(statusBar);
-    dc.SetFont(statusBar->GetFont());
-
-    wxCoord y;
-    dc.GetTextExtent(_T("X"), NULL, &y );
-
-    int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
-
-    statusBar->SetSize(-1, -1, -1, height);
-

     statusBar->SetFieldsCount(number);
 
     return statusBar;
     statusBar->SetFieldsCount(number);
 
     return statusBar;


@@ -331,14 +316,11 @@ void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event)
 // Pass TRUE to show full screen, FALSE to restore.
 bool wxFrameMSW::ShowFullScreen(bool show, long style)
 {
 // Pass TRUE to show full screen, FALSE to restore.
 bool wxFrameMSW::ShowFullScreen(bool show, long style)
 {

+    if ( IsFullScreen() == show ) 
+        return FALSE;
+

     if (show)
     {
     if (show)
     {

-        if (IsFullScreen())
-            return FALSE;
-
-        m_fsIsShowing = TRUE;
-        m_fsStyle = style;
-

 #if wxUSE_TOOLBAR
         wxToolBar *theToolBar = GetToolBar();
         if (theToolBar)
 #if wxUSE_TOOLBAR
         wxToolBar *theToolBar = GetToolBar();
         if (theToolBar)


@@ -374,54 +356,9 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style)
         else
             m_fsStatusBarFields = 0;
 #endif // wxUSE_STATUSBAR
         else
             m_fsStatusBarFields = 0;
 #endif // wxUSE_STATUSBAR

-
-        // zap the frame borders
-
-        // save the 'normal' window style
-        m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
-
-        // save the old position, width & height, maximize state
-        m_fsOldSize = GetRect();
-        m_fsIsMaximized = IsMaximized();
-
-        // decide which window style flags to turn off
-        LONG newStyle = m_fsOldWindowStyle;
-        LONG offFlags = 0;
-
-        if (style & wxFULLSCREEN_NOBORDER)
-            offFlags |= WS_BORDER | WS_THICKFRAME;
-        if (style & wxFULLSCREEN_NOCAPTION)
-            offFlags |= (WS_CAPTION | WS_SYSMENU);
-
-        newStyle &= (~offFlags);
-
-        // change our window style to be compatible with full-screen mode
-        ::SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
-
-        // resize to the size of the desktop
-        int width, height;
-
-        RECT rect = wxGetWindowRect(::GetDesktopWindow());
-        width = rect.right - rect.left;
-        height = rect.bottom - rect.top;
-
-        SetSize(width, height);
-
-        // now flush the window style cache and actually go full-screen
-        SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED);
-
-        wxSizeEvent event(wxSize(width, height), GetId());
-        GetEventHandler()->ProcessEvent(event);
-
-        return TRUE;

     }
     else
     {
     }
     else
     {

-        if (!IsFullScreen())
-            return FALSE;
-
-        m_fsIsShowing = FALSE;
-

 #if wxUSE_TOOLBAR
         wxToolBar *theToolBar = GetToolBar();
 
 #if wxUSE_TOOLBAR
         wxToolBar *theToolBar = GetToolBar();
 


@@ -449,14 +386,9 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style)
         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
             SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
 #endif
         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
             SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
 #endif

-
-        Maximize(m_fsIsMaximized);
-        SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
-        SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,
-            m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
-
-        return TRUE;

     }
     }

+    
+    return wxFrameBase::ShowFullScreen(show, style);

 }
 
 // Default activation behaviour - set the focus for the first child
 }
 
 // Default activation behaviour - set the focus for the first child