X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..125e7c11c16f23daa4c594f3b8d90194099c2394:/include/wx/mgl/window.h?ds=inline diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h index f89bfe3bc5..92f50b208b 100644 --- a/include/wx/mgl/window.h +++ b/include/wx/mgl/window.h @@ -74,12 +74,6 @@ public: virtual int GetCharHeight() const; virtual int GetCharWidth() const; - virtual void GetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *theFont = (const wxFont *) NULL) - const; #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget(wxDropTarget *dropTarget); @@ -110,6 +104,11 @@ protected: int m_eraseBackground; // implement the base class pure virtuals + virtual void DoGetTextExtent(const wxString& string, + int *x, int *y, + int *descent = NULL, + int *externalLeading = NULL, + const wxFont *font = NULL) const; virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const; @@ -139,7 +138,7 @@ private: friend class wxPaintDC; DECLARE_DYNAMIC_CLASS(wxWindowMGL) - DECLARE_NO_COPY_CLASS(wxWindowMGL) + wxDECLARE_NO_COPY_CLASS(wxWindowMGL); DECLARE_EVENT_TABLE() public: