X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..55a0f1e30311fee4b9694204afe5b5218dd438d1:/include/wx/dfb/window.h diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h index d70774f9cc..b12d07ab87 100644 --- a/include/wx/dfb/window.h +++ b/include/wx/dfb/window.h @@ -81,12 +81,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); @@ -112,6 +106,11 @@ public: protected: // implement the base class pure virtuals + virtual void DoGetTextExtent(const wxString& string, + int *x, int *y, + int *descent = NULL, + int *externalLeading = NULL, + const wxFont *theFont = 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; @@ -190,7 +189,7 @@ private: friend class wxWindowDCImpl; // for PaintOverlays DECLARE_DYNAMIC_CLASS(wxWindowDFB) - DECLARE_NO_COPY_CLASS(wxWindowDFB) + wxDECLARE_NO_COPY_CLASS(wxWindowDFB); DECLARE_EVENT_TABLE() };