X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968eb2ef396c78442ffea7a2463f3777ca6d1632..0416c41834f36316a03720c4ed05cdf36964a2f3:/include/wx/x11/dcclient.h diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h index 717ef91ea2..7f939a3ec9 100644 --- a/include/wx/x11/dcclient.h +++ b/include/wx/x11/dcclient.h @@ -12,10 +12,6 @@ #ifndef _WX_DCCLIENT_H_ #define _WX_DCCLIENT_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "dcclient.h" -#endif - #include "wx/dc.h" #include "wx/region.h" @@ -104,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; @@ -116,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; @@ -140,7 +138,6 @@ protected: void SetUpDC(); void Destroy(); - virtual void ComputeScaleAndOrigin(); private: DECLARE_DYNAMIC_CLASS(wxWindowDC)