X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/os2/window.h diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h index 6f2294c6b5..bd6193b209 100644 --- a/include/wx/os2/window.h +++ b/include/wx/os2/window.h @@ -98,19 +98,6 @@ public: 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 = NULL - ,int* pExternalLeading = 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 @@ -131,7 +118,7 @@ public: ); 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 @@ -195,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 @@ -460,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; @@ -534,7 +534,7 @@ private: SWP m_vWinSwp; DECLARE_DYNAMIC_CLASS(wxWindowOS2); - DECLARE_NO_COPY_CLASS(wxWindowOS2) + wxDECLARE_NO_COPY_CLASS(wxWindowOS2); DECLARE_EVENT_TABLE() }; // end of wxWindow