X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e604d44b4b03f1f36998f91311d4e18e8f1b290e..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/os2/frame.h?ds=sidebyside diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h index 468341d98e..88cac74d0f 100644 --- a/include/wx/os2/frame.h +++ b/include/wx/os2/frame.h @@ -15,7 +15,7 @@ // // Get the default resource ID's for frames // -#include "wx/os2/wxOs2.h" +#include "wx/os2/wxrsc.h" class WXDLLEXPORT wxFrame : public wxFrameBase { @@ -23,13 +23,13 @@ public: // construction wxFrame() { Init(); } 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 - ) + ,wxWindowID vId + ,const wxString& rsTitle + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = wxDEFAULT_FRAME_STYLE + ,const wxString& rsName = wxFrameNameStr + ) { Init(); @@ -48,24 +48,18 @@ public: virtual ~wxFrame(); // implement base class pure virtuals - virtual void Maximize(bool bMaximize = TRUE); - virtual bool IsMaximized(void) const; - virtual void Iconize(bool bIconize = TRUE); - virtual bool IsIconized(void) const; - virtual void Restore(void); +#if wxUSE_MENUS_NATIVE virtual void SetMenuBar(wxMenuBar* pMenubar); - virtual void SetIcon(const wxIcon& rIcon); +#endif virtual bool ShowFullScreen( bool bShow ,long lStyle = wxFULLSCREEN_ALL ); - virtual bool IsFullScreen(void) const { return m_bFsIsShowing; }; // implementation only from now on // ------------------------------- - // override some more virtuals - virtual bool Show(bool bShow = TRUE); + virtual void Raise(void); // event handlers void OnActivate(wxActivateEvent& rEvent); @@ -122,52 +116,48 @@ public: ,WXHMENU hMenu ); - bool OS2Create( int nId - ,wxWindow* pParent - ,const wxChar* zWclass - ,wxWindow* pWxWin - ,const wxChar* zTitle - ,int nX - ,int nY - ,int nWidth - ,int nHeight - ,long nStyle - ); - // tooltip management #if wxUSE_TOOLTIPS WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; } void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; } #endif // tooltips + // + // Called by wxWindow whenever it gets focus + // + void SetLastFocus(wxWindow* pWin) { m_pWinLastFocused = pWin; } + wxWindow *GetLastFocus(void) const { return m_pWinLastFocused; } + + void SetClient(WXHWND c_Hwnd); + void SetClient(wxWindow* c_Window); + wxWindow *GetClient(); + + friend MRESULT EXPENTRY wxFrameWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam); + friend MRESULT EXPENTRY wxFrameMainWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam); + protected: // common part of all ctors void Init(void); - // common part of Iconize(), Maximize() and Restore() - void DoShowWindow(int nShowCmd); - + virtual WXHICON GetDefaultIcon(void) const; // override base class virtuals virtual void DoGetClientSize( int* pWidth ,int* pHeight ) const; - virtual void DoGetSize( int* pWidth - ,int* pHeight - ) const; - virtual void DoGetPosition( int* pX - ,int* pY - ) const; virtual void DoSetClientSize( int nWidth ,int nWeight ); + inline virtual bool IsMDIChild(void) const { return FALSE; } +#if wxUSE_MENUS_NATIVE // helper 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 virtual void InternalSetMenuBar(void); - +#endif // propagate our state change to all child frames void IconizeChildFrames(bool bIconize); @@ -196,6 +186,7 @@ protected: int m_nFsToolBarHeight; bool m_bFsIsMaximized; bool m_bFsIsShowing; + bool m_bWasMinimized; bool m_bIsShown; wxWindow* m_pWinLastFocused; @@ -205,7 +196,9 @@ private: #endif // tooltips // - // Handles to child windows of the Frame that we don't have child objects for + // 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; @@ -215,8 +208,6 @@ private: // Swp structures for various client data // DW: Better off in attached RefData? // - SWP m_vSwp; - SWP m_vSwpClient; SWP m_vSwpTitleBar; SWP m_vSwpMenuBar; SWP m_vSwpHScroll;