X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..38a097f588121ffcab2fa57e4494a6d0783c3567:/include/wx/x11/dcclient.h diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h index 1af2a6c739..7f939a3ec9 100644 --- a/include/wx/x11/dcclient.h +++ b/include/wx/x11/dcclient.h @@ -100,11 +100,6 @@ public: virtual wxCoord GetCharHeight() const; virtual wxCoord GetCharWidth() const; - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - wxFont *theFont = NULL) const; virtual int GetDepth() const; virtual wxSize GetPPI() const; @@ -112,9 +107,16 @@ public: virtual void DestroyClippingRegion(); WXWindow GetWindow() const { return m_window; } + virtual void ComputeScaleAndOrigin(); + protected: // implementation // -------------- + virtual void DoGetTextExtent(const wxString& string, + wxCoord *x, wxCoord *y, + wxCoord *descent = NULL, + wxCoord *externalLeading = NULL, + wxFont *theFont = NULL) const; WXDisplay *m_display; WXWindow m_window; @@ -136,7 +138,6 @@ protected: void SetUpDC(); void Destroy(); - virtual void ComputeScaleAndOrigin(); private: DECLARE_DYNAMIC_CLASS(wxWindowDC)