Applied patch [ 736322 ] Remove TWINE support, merge it in Wine.

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index abd5752e93683a1b31b97acee4a67d4e5a6b5b88..369f3a3f5663a9d68fdcc1cf46577bb8f70434cf 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/frame.h
-// Purpose:     wxFrameMSW class
+// Purpose:     wxFrame class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
@@ -16,12 +16,12 @@
     #pragma interface "frame.h"
 #endif
 
-class WXDLLEXPORT wxFrameMSW : public wxFrameBase
+class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:
     // construction
-    wxFrameMSW() { Init(); }
-    wxFrameMSW(wxWindow *parent,
+    wxFrame() { Init(); }
+    wxFrame(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
                const wxPoint& pos = wxDefaultPosition,
@@ -42,27 +42,16 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxFrameMSW();
+    virtual ~wxFrame();
 
     // implement base class pure virtuals
-    virtual void Raise();
-    virtual void Maximize(bool maximize = TRUE);
-    virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = TRUE);
-    virtual bool IsIconized() const;
-    virtual void Restore();
-    virtual void SetIcon(const wxIcon& icon);
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
+    virtual void Raise();
 
     // implementation only from now on
     // -------------------------------
 
-    // override some more virtuals
-    virtual bool Show(bool show = TRUE);
-
     // event handlers
-    void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // Toolbar
@@ -101,10 +90,7 @@ public:
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
-
-    bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass,
-                   wxWindow *wx_win, const wxChar *title,
-                   int x, int y, int width, int height, long style);
+    bool HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup);
 
     // tooltip management
 #if wxUSE_TOOLTIPS
@@ -114,24 +100,14 @@ public:
 
     // 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();
-
-    // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
-    wxWindow *GetLastFocus() const { return m_winLastFocused; }
+    virtual void SendSizeEvent();
 
 protected:
     // common part of all ctors
     void Init();
 
-    // common part of Iconize(), Maximize() and Restore()
-    void DoShowWindow(int nShowCmd);
-
     // override base class virtuals
     virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetPosition(int *x, int *y) const;
-
     virtual void DoSetClientSize(int width, int height);
 
 #if wxUSE_MENUS_NATIVE
@@ -154,39 +130,28 @@ protected:
 
     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;
+    // get default (wxWindows) icon for the frame
+    virtual WXHICON GetDefaultIcon() const;
 
 #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;
-    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;
 #endif // tooltips
 
+    // used by IconizeChildFrames(), see comments there
+    bool m_wasMinimized;
+
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
 #endif