X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47a8a4d5cc3e8fcb2efee4787cb9d244104beea5..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/include/wx/os2/window.h?ds=sidebyside diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h index 4e035fa4df..bd6193b209 100644 --- a/include/wx/os2/window.h +++ b/include/wx/os2/window.h @@ -34,13 +34,13 @@ // forward declarations // --------------------------------------------------------------------------- -class WXDLLEXPORT wxButton; +class WXDLLIMPEXP_FWD_CORE wxButton; // --------------------------------------------------------------------------- // wxWindow declaration for OS/2 PM // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowOS2 : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowOS2 : public wxWindowBase { public: wxWindowOS2() @@ -85,34 +85,19 @@ public: virtual void DoEnable(bool bEnable); virtual void SetFocus(void); virtual void SetFocusFromKbd(void); - virtual bool Reparent(wxWindow* pNewParent); + virtual bool Reparent(wxWindowBase* pNewParent); virtual void WarpPointer( int x ,int y ); virtual void Refresh( bool bEraseBackground = true ,const wxRect* pRect = (const wxRect *)NULL ); - virtual void Freeze(void); virtual void Update(void); - virtual void Thaw(void); virtual void SetWindowStyleFlag(long lStyle); virtual bool SetCursor(const wxCursor& rCursor); virtual bool SetFont(const wxFont& rFont); virtual int GetCharHeight(void) const; virtual int GetCharWidth(void) const; - virtual void GetTextExtent( const wxString& rString - ,int* pX - ,int* pY - ,int* pDescent = (int *)NULL - ,int* pExternalLeading = (int *)NULL - ,const wxFont* pTheFont = (const wxFont *)NULL - ) const; -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu* pMenu - ,int nX - ,int nY - ); -#endif // wxUSE_MENUS_NATIVE virtual void SetScrollbar( int nOrient ,int nPos @@ -129,11 +114,11 @@ public: virtual int GetScrollRange(int nOrient) const; virtual void ScrollWindow( int nDx ,int nDy - ,const wxRect* pRect = (wxRect *)NULL + ,const wxRect* pRect = NULL ); inline HWND GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;} - inline HWND GetScrollBarVert(void) const {return m_hWndScrollBarVert;}; + inline HWND GetScrollBarVert(void) const {return m_hWndScrollBarVert;} #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget(wxDropTarget* pDropTarget); #endif // wxUSE_DRAG_AND_DROP @@ -197,7 +182,7 @@ public: ); // PM only: true if this control is part of the main control - virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }; + virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; } // translate wxWidgets style flags for this control into the PM style // and optional extended style for the corresponding native control @@ -416,6 +401,9 @@ public: PSWP GetSwp(void) {return &m_vWinSwp;} protected: + virtual void DoFreeze(void); + virtual void DoThaw(void); + // PM can't create some MSW styles natively but can perform these after // creation by sending messages typedef enum extra_flags { kFrameToolWindow = 0x0001 @@ -459,6 +447,19 @@ protected: long m_lDlgCode; // implement the base class pure virtuals + virtual void GetTextExtent( const wxString& rString + ,int* pX + ,int* pY + ,int* pDescent = NULL + ,int* pExternalLeading = NULL + ,const wxFont* pTheFont = NULL + ) const; +#if wxUSE_MENUS_NATIVE + virtual bool DoPopupMenu( wxMenu* pMenu + ,int nX + ,int nY + ); +#endif // wxUSE_MENUS_NATIVE virtual void DoClientToScreen( int* pX ,int* pY ) const; @@ -533,14 +534,8 @@ private: SWP m_vWinSwp; DECLARE_DYNAMIC_CLASS(wxWindowOS2); - DECLARE_NO_COPY_CLASS(wxWindowOS2) + wxDECLARE_NO_COPY_CLASS(wxWindowOS2); DECLARE_EVENT_TABLE() - - // - // Virtual function hiding supression - // - inline virtual bool Reparent(wxWindowBase* pNewParent) - { return(wxWindowBase::Reparent(pNewParent));} }; // end of wxWindow class wxWindowCreationHook @@ -555,8 +550,8 @@ public: // --------------------------------------------------------------------------- // kbd code translation -WXDLLEXPORT int wxCharCodeOS2ToWX(int nKeySym); -WXDLLEXPORT int wxCharCodeWXToOS2( int nId +WXDLLIMPEXP_CORE int wxCharCodeOS2ToWX(int nKeySym); +WXDLLIMPEXP_CORE int wxCharCodeWXToOS2( int nId ,bool* pbIsVirtual = NULL );