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

decouple wxTLW,Frame::ShowFullScreen in wxMSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-14 22:16:16 +00:00
parent 1ccd23f5c4
commit 41e929e5cf
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/msw/frame.h
View File

@@ -46,7 +46,6 @@ public:
// implement base class pure virtuals // implement base class pure virtuals
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; };
virtual void Raise(); virtual void Raise();
// implementation only from now on // implementation only from now on
@@ -146,15 +145,10 @@ protected:
wxWindow *m_winLastFocused; wxWindow *m_winLastFocused;
// Data to save/restore when calling ShowFullScreen // 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_fsStatusBarFields; // 0 for no status bar
int m_fsStatusBarHeight; int m_fsStatusBarHeight;
int m_fsToolBarHeight; int m_fsToolBarHeight;
// WXHMENU m_fsMenu; // WXHMENU m_fsMenu;
bool m_fsIsMaximized;
bool m_fsIsShowing;
private: private:
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS

12
include/wx/msw/toplevel.h
View File

@@ -59,9 +59,8 @@ public:
virtual bool Show(bool show = TRUE); virtual bool Show(bool show = TRUE);
// FIXME -- not yet moved from wxFrame to wxTLW virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) { return FALSE; } virtual bool IsFullScreen() const { return m_fsIsShowing; }
virtual bool IsFullScreen() const { return FALSE; }
// implementation from now on // implementation from now on
// -------------------------- // --------------------------
@@ -100,6 +99,13 @@ protected:
// should the frame be maximized when it will be shown? set by Maximize() // should the frame be maximized when it will be shown? set by Maximize()
// when it is called while the frame is hidden // when it is called while the frame is hidden
bool m_maximizeOnShow; 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 // list of all frames and modeless dialogs