From 41e929e5cf10cbc6298c9a7750233123964a05f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 14 Oct 2001 22:16:16 +0000 Subject: [PATCH] decouple wxTLW,Frame::ShowFullScreen in wxMSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/frame.h | 6 ------ include/wx/msw/toplevel.h | 12 +++++++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index 2b63cc5149..8ea17a382e 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -46,7 +46,6 @@ public: // implement base class pure virtuals virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; }; virtual void Raise(); // implementation only from now on @@ -146,15 +145,10 @@ protected: wxWindow *m_winLastFocused; // Data to save/restore when calling ShowFullScreen - long m_fsStyle; // Passed to ShowFullScreen - wxRect m_fsOldSize; - long m_fsOldWindowStyle; int m_fsStatusBarFields; // 0 for no status bar int m_fsStatusBarHeight; int m_fsToolBarHeight; // WXHMENU m_fsMenu; - bool m_fsIsMaximized; - bool m_fsIsShowing; private: #if wxUSE_TOOLTIPS diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index 98ae4f2594..e84fe2267e 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -59,9 +59,8 @@ public: virtual bool Show(bool show = TRUE); - // FIXME -- not yet moved from wxFrame to wxTLW - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) { return FALSE; } - virtual bool IsFullScreen() const { return FALSE; } + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); + virtual bool IsFullScreen() const { return m_fsIsShowing; } // implementation from now on // -------------------------- @@ -100,6 +99,13 @@ protected: // should the frame be maximized when it will be shown? set by Maximize() // when it is called while the frame is hidden bool m_maximizeOnShow; + + // Data to save/restore when calling ShowFullScreen + long m_fsStyle; // Passed to ShowFullScreen + wxRect m_fsOldSize; + long m_fsOldWindowStyle; + bool m_fsIsMaximized; + bool m_fsIsShowing; }; // list of all frames and modeless dialogs -- 2.45.2