wxFileName II. It actually works.

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 81f12ec2bc33c0c0036ddab9e759b0dc371fb8cd..325f0acc510b96a4772cc5df38a7d6a830a022b4 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 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
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -94,10 +96,6 @@ public:
 
     WXHMENU GetWinMenu() const { return m_hMenu; }
 
 
     WXHMENU GetWinMenu() const { return m_hMenu; }
 

-    // Returns the origin of client area (may be different from (0,0) if the
-    // frame has a toolbar)
-    virtual wxPoint GetClientAreaOrigin() const;
-

     // event handlers
     bool HandlePaint();
     bool HandleSize(int x, int y, WXUINT flag);
     // event handlers
     bool HandlePaint();
     bool HandleSize(int x, int y, WXUINT flag);


@@ -128,9 +126,6 @@ protected:
 
     virtual void DoSetClientSize(int width, int height);
 
 
     virtual void DoSetClientSize(int width, int height);
 

-    virtual void DoClientToScreen(int *x, int *y) const;
-    virtual void DoScreenToClient(int *x, int *y) const;
-

     // helper
     void DetachMenuBar();
 
     // helper
     void DetachMenuBar();
 


@@ -146,6 +141,8 @@ protected:
 
     // window proc for the frames
     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // 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;
 
     bool                  m_iconized;
     WXHICON               m_defaultIcon;


@@ -154,6 +151,20 @@ protected:
     static bool           m_useNativeStatusBar;
 #endif // 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;
 private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;