correction for Mac OS X

[wxWidgets.git] / include / wx / msw / frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 4294359921a0830927d1f9efe2fab6b429bdefb6..d9c67c2bd2565e9ea308d2b54f456aaebe586e55 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -52,6 +52,8 @@ public:
     virtual void Restore();
     virtual void SetMenuBar(wxMenuBar *menubar);
     virtual void SetIcon(const wxIcon& icon);
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool IsFullScreen() const { return m_fsIsShowing; };
 
     // implementation only from now on
     // -------------------------------
@@ -110,6 +112,10 @@ public:
     void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
+    // a MSW only function which sends a size event to the window using its
+    // current size - this has an effect of refreshing the window layout
+    void SendSizeEvent();
+
 protected:
     // common part of all ctors
     void Init();
@@ -139,6 +145,8 @@ protected:
 
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    
+    virtual bool IsMDIChild() const { return FALSE; }
 
     bool                  m_iconized;
     WXHICON               m_defaultIcon;
@@ -147,6 +155,20 @@ protected:
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 
+    // the last focused child: we restore focus to it on activation
+    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
     WXHWND                m_hwndToolTip;