X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..a9e8bf2dd9bccb38eb39fba955125aaf23d6f500:/include/wx/gtk/dcclient.h diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 70b7d9b38f..2555d5b388 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -10,10 +10,6 @@ #ifndef __GTKDCCLIENTH__ #define __GTKDCCLIENTH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/dc.h" #include "wx/window.h" @@ -79,6 +75,8 @@ protected: wxCoord *descent = (wxCoord *) NULL, wxCoord *externalLeading = (wxCoord *) NULL, wxFont *theFont = (wxFont *) NULL) const; + virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); + virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); public: virtual wxCoord GetCharWidth() const; @@ -96,9 +94,7 @@ public: virtual void SetBackgroundMode( int mode ); virtual void SetPalette( const wxPalette& palette ); - virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); virtual void DestroyClippingRegion(); - virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); // Resolution in pixels per logical inch virtual wxSize GetPPI() const; @@ -120,11 +116,9 @@ public: wxRegion m_paintClippingRegion; // PangoContext stuff for GTK 2.0 -#ifdef __WXGTK20__ PangoContext *m_context; PangoLayout *m_layout; PangoFontDescription *m_fontdesc; -#endif void SetUpDC(); void Destroy();