fixed wxFontDialog API: accept const ref instead of (well, in addition to) a possibly...

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 2b63cc5149456cc821e0e774dfb59ec48aa8f92b..b3f81e6c796b9bd30803d8826fa37bea1a523e59 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/frame.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/frame.h

-// Purpose:     wxFrameMSW class
+// Purpose:     wxFrame class

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -16,12 +16,12 @@
     #pragma interface "frame.h"
 #endif
 
     #pragma interface "frame.h"
 #endif
 

-class WXDLLEXPORT wxFrameMSW : public wxFrameBase
+class WXDLLEXPORT wxFrame : public wxFrameBase

 {
 public:
     // construction
 {
 public:
     // construction

-    wxFrameMSW() { Init(); }
-    wxFrameMSW(wxWindow *parent,
+    wxFrame() { Init(); }
+    wxFrame(wxWindow *parent,

                wxWindowID id,
                const wxString& title,
                const wxPoint& pos = wxDefaultPosition,
                wxWindowID id,
                const wxString& title,
                const wxPoint& pos = wxDefaultPosition,


@@ -42,11 +42,10 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

-    virtual ~wxFrameMSW();
+    virtual ~wxFrame();

 
     // implement base class pure virtuals
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 
     // 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
     virtual void Raise();
 
     // implementation only from now on


@@ -92,6 +91,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 HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);

+    bool HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup);

 
     // tooltip management
 #if wxUSE_TOOLTIPS
 
     // tooltip management
 #if wxUSE_TOOLTIPS


@@ -146,22 +146,21 @@ protected:
     wxWindow             *m_winLastFocused;
 
     // Data to save/restore when calling ShowFullScreen
     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;
     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
 
 
 private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 

+    // used by IconizeChildFrames(), see comments there
+    bool m_wasMinimized;
+

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif
 };
 
 #endif