A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 410081887e0d78ff3f0dfe08a18742b6cbb8d2d6..22509da92084c554c1400ef5ea989e4bf64bac04 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:     wxFrame class
+// Purpose:     wxFrameMSW class

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


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

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

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

-    wxFrame() { Init(); }
-    wxFrame(wxWindow *parent,
-            wxWindowID id,
-            const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
+    wxFrameMSW() { Init(); }
+    wxFrameMSW(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxDEFAULT_FRAME_STYLE,
+               const wxString& name = wxFrameNameStr)

     {
         Init();
 
     {
         Init();
 


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

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

 
     // implement base class pure virtuals
     virtual void Maximize(bool maximize = TRUE);
 
     // implement base class pure virtuals
     virtual void Maximize(bool maximize = TRUE);


@@ -50,7 +50,6 @@ public:
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void Restore();
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     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; };
     virtual void SetIcon(const wxIcon& icon);
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; };


@@ -112,6 +111,14 @@ public:
     void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
     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();
+
+    // called by wxWindow whenever it gets focus
+    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
+    wxWindow *GetLastFocus() const { return m_winLastFocused; }
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -126,12 +133,14 @@ protected:
 
     virtual void DoSetClientSize(int width, int height);
 
 
     virtual void DoSetClientSize(int width, int height);
 

-    // helper
-    void DetachMenuBar();
+#if wxUSE_MENUS_NATIVE
+    // perform MSW-specific action when menubar is changed
+    virtual void AttachMenuBar(wxMenuBar *menubar);

 
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();
 
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();

+#endif // wxUSE_MENUS_NATIVE

 
     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);
 
     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);


@@ -142,7 +151,15 @@ 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);
 

-    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
     WXHICON               m_defaultIcon;
 
 #if wxUSE_STATUSBAR


@@ -169,7 +186,6 @@ private:
 #endif // tooltips
 
     DECLARE_EVENT_TABLE()
 #endif // tooltips
 
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif
 };
 
 #endif