warning fixed

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index f17f7e57dfbfe722952eb74ed3c05c68b81add57..5e161cd3ab1d06267e2af3971870471278a482be 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -112,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();
@@ -142,13 +146,24 @@ protected:
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
-    bool                  m_iconized;
+    virtual bool IsMDIChild() const { return FALSE; }
+
+    // is the frame currently iconized?
+    bool m_iconized;
+
+    // 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;
+
     WXHICON               m_defaultIcon;
 
 #if wxUSE_STATUSBAR
     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;