Window management and sizer layout corrections

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index bdb35dcdc964a875c34d2624137001e42c172bf1..88cac74d0fa8c712f37764bc2e629ac5b9f9cded 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -12,80 +12,87 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 

+//
+// Get the default resource ID's for frames
+//
+#include "wx/os2/wxrsc.h"
+

 class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:
     // construction
     wxFrame() { Init(); }
 class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 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)
+    wxFrame( wxWindow*       pParent
+               ,wxWindowID      vId
+               ,const wxString& rsTitle
+               ,const wxPoint&  rPos = wxDefaultPosition
+               ,const wxSize&   rSize = wxDefaultSize
+               ,long            lStyle = wxDEFAULT_FRAME_STYLE
+               ,const wxString& rsName = wxFrameNameStr
+              )

     {
         Init();
 
     {
         Init();
 

-        Create(parent, id, title, pos, size, style, name);
+        Create(pParent, vId, rsTitle, rPos, rSize, lStyle, rsName);

     }
 
     }
 

-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
+    bool Create( wxWindow*       pParent
+                ,wxWindowID      vId
+                ,const wxString& rsTitle
+                ,const wxPoint&  rPos = wxDefaultPosition
+                ,const wxSize&   rSize = wxDefaultSize
+                ,long            lStyle = wxDEFAULT_FRAME_STYLE
+                ,const wxString& rsName = wxFrameNameStr
+               );

 
     virtual ~wxFrame();
 
     // implement base class pure virtuals
 
     virtual ~wxFrame();
 
     // implement base class pure virtuals

-    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 SetMenuBar(wxMenuBar *menubar);
-    virtual void SetIcon(const wxIcon& icon);
+#if wxUSE_MENUS_NATIVE
+    virtual void SetMenuBar(wxMenuBar* pMenubar);
+#endif
+    virtual bool ShowFullScreen( bool bShow
+                                ,long lStyle = wxFULLSCREEN_ALL
+                               );
+

 
     // implementation only from now on
     // -------------------------------
 
 
     // implementation only from now on
     // -------------------------------
 

-    // override some more virtuals
-    virtual bool Show(bool show = TRUE);
+    virtual void Raise(void);

 
     // event handlers
 
     // event handlers

-    void OnActivate(wxActivateEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
+    void OnActivate(wxActivateEvent& rEvent);
+    void OnSysColourChanged(wxSysColourChangedEvent& rEvent);

 
     // Toolbar
 #if wxUSE_TOOLBAR
 
     // Toolbar
 #if wxUSE_TOOLBAR

-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
-                                     wxWindowID id = -1,
-                                     const wxString& name = wxToolBarNameStr);
+    virtual wxToolBar* CreateToolBar( long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT
+                                     ,wxWindowID      vId = -1
+                                     ,const wxString& rsName = wxToolBarNameStr
+                                    );

 
 

-    virtual void PositionToolBar();
+    virtual void       PositionToolBar(void);

 #endif // wxUSE_TOOLBAR
 
     // Status bar
 #if wxUSE_STATUSBAR
 #endif // wxUSE_TOOLBAR
 
     // Status bar
 #if wxUSE_STATUSBAR

-    virtual wxStatusBar* OnCreateStatusBar(int number = 1,
-                                           long style = wxST_SIZEGRIP,
-                                           wxWindowID id = 0,
-                                           const wxString& name = wxStatusLineNameStr);
-
-    virtual void PositionStatusBar();
+    virtual wxStatusBar* OnCreateStatusBar( int             nNumber = 1
+                                           ,long            lStyle = wxST_SIZEGRIP
+                                           ,wxWindowID      vId = 0
+                                           ,const wxString& rsName = wxStatusLineNameStr
+                                          );
+    virtual void PositionStatusBar(void);

 
     // Hint to tell framework which status bar to use: the default is to use
     // native one for the platforms which support it (Win32), the generic one
     // otherwise
 
     // TODO: should this go into a wxFrameworkSettings class perhaps?
 
     // Hint to tell framework which status bar to use: the default is to use
     // native one for the platforms which support it (Win32), the generic one
     // otherwise
 
     // TODO: should this go into a wxFrameworkSettings class perhaps?

-    static void UseNativeStatusBar(bool useNative)
-        { m_useNativeStatusBar = useNative; };
+    static void UseNativeStatusBar(bool bUseNative)
+        { m_bUseNativeStatusBar = bUseNative; };

     static bool UsesNativeStatusBar()
     static bool UsesNativeStatusBar()

-        { return m_useNativeStatusBar; };
+        { return m_bUseNativeStatusBar; };

 #endif // wxUSE_STATUSBAR
 
     WXHMENU GetWinMenu() const { return m_hMenu; }
 #endif // wxUSE_STATUSBAR
 
     WXHMENU GetWinMenu() const { return m_hMenu; }


@@ -95,45 +102,62 @@ public:
     virtual wxPoint GetClientAreaOrigin() const;
 
     // event handlers
     virtual wxPoint GetClientAreaOrigin() const;
 
     // event handlers

-    bool HandlePaint();
-    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 OS2Create(int id, wxWindow *parent, const wxChar *wclass,
-                   wxWindow *wx_win, const wxChar *title,
-                   int x, int y, int width, int height, long style);
+    bool HandlePaint(void);
+    bool HandleSize( int    nX
+                    ,int    nY
+                    ,WXUINT uFlag
+                   );
+    bool HandleCommand( WXWORD wId
+                       ,WXWORD wCmd
+                       ,WXHWND wControl
+                      );
+    bool HandleMenuSelect( WXWORD  wItem
+                          ,WXWORD  wFlags
+                          ,WXHMENU hMenu
+                         );

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

-    WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
+    WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }
+    void   SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }

 #endif // tooltips
 
 #endif // tooltips
 

-protected:
-    // common part of all ctors
-    void Init();
+    //
+    // Called by wxWindow whenever it gets focus
+    //
+    void SetLastFocus(wxWindow* pWin) { m_pWinLastFocused = pWin; }
+    wxWindow *GetLastFocus(void) const { return m_pWinLastFocused; }

 
 

-    // 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;
+    void      SetClient(WXHWND    c_Hwnd);
+    void      SetClient(wxWindow* c_Window);
+    wxWindow *GetClient();

 
 

-    virtual void DoSetClientSize(int width, int height);
+ friend MRESULT EXPENTRY wxFrameWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
+ friend MRESULT EXPENTRY wxFrameMainWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);

 
 

-    virtual void DoClientToScreen(int *x, int *y) const;
-    virtual void DoScreenToClient(int *x, int *y) const;
+protected:
+    // common part of all ctors
+    void         Init(void);

 
 

+    virtual WXHICON GetDefaultIcon(void) const;
+    // override base class virtuals
+    virtual void DoGetClientSize( int* pWidth
+                                 ,int* pHeight
+                                ) const;
+    virtual void DoSetClientSize( int nWidth
+                                 ,int nWeight
+                                );
+    inline virtual bool IsMDIChild(void) const { return FALSE; }
+
+#if wxUSE_MENUS_NATIVE

     // helper
     // helper

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

     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set

-    virtual void InternalSetMenuBar();
-
+    virtual void InternalSetMenuBar(void);
+#endif

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


@@ -141,20 +165,56 @@ protected:
     bool OS2TranslateMessage(WXMSG* pMsg);
 
     // window proc for the frames
     bool OS2TranslateMessage(WXMSG* pMsg);
 
     // window proc for the frames

-    MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    MRESULT OS2WindowProc( WXUINT   uMessage
+                          ,WXWPARAM wParam
+                          ,WXLPARAM lParam
+                         );

 
 

-    bool                  m_iconized;
-    WXHICON               m_defaultIcon;
+    bool                            m_bIconized;
+    WXHICON                         m_hDefaultIcon;

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-    static bool           m_useNativeStatusBar;
+    static bool                     m_bUseNativeStatusBar;

 #endif // wxUSE_STATUSBAR
 
 #endif // wxUSE_STATUSBAR
 

+    // Data to save/restore when calling ShowFullScreen
+    long                            m_lFsStyle;           // Passed to ShowFullScreen
+    wxRect                          m_vFsOldSize;
+    long                            m_lFsOldWindowStyle;
+    int                             m_nFsStatusBarFields; // 0 for no status bar
+    int                             m_nFsStatusBarHeight;
+    int                             m_nFsToolBarHeight;
+    bool                            m_bFsIsMaximized;
+    bool                            m_bFsIsShowing;
+    bool                            m_bWasMinimized;
+    bool                            m_bIsShown;
+    wxWindow*                       m_pWinLastFocused;
+

 private:
 #if wxUSE_TOOLTIPS
 private:
 #if wxUSE_TOOLTIPS

-    WXHWND                m_hwndToolTip;
+    WXHWND                          m_hWndToolTip;

 #endif // tooltips
 
 #endif // tooltips
 

+    //
+    // Handles to child windows of the Frame, and the frame itself,
+    // that we don't have child objects for (m_hWnd in wxWindow is the
+    // handle of the Frame's client window!
+    //
+    WXHWND                          m_hTitleBar;
+    WXHWND                          m_hHScroll;
+    WXHWND                          m_hVScroll;
+
+    //
+    // Swp structures for various client data
+    // DW: Better off in attached RefData?
+    //
+    SWP                             m_vSwpTitleBar;
+    SWP                             m_vSwpMenuBar;
+    SWP                             m_vSwpHScroll;
+    SWP                             m_vSwpVScroll;
+    SWP                             m_vSwpStatusBar;
+    SWP                             m_vSwpToolBar;
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };