X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b30ac82dd01b5ca4fd1db2f2889b7714ad1577c..6ba7c06eeeda47b88783025428ca0f290e3bf236:/include/wx/gtk/dcclient.h diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 15ebfa6b56..802e60b693 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -10,7 +10,7 @@ #ifndef __GTKDCCLIENTH__ #define __GTKDCCLIENTH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -35,14 +35,14 @@ public: wxWindowDC(); wxWindowDC( wxWindow *win ); - ~wxWindowDC(); + virtual ~wxWindowDC(); virtual bool CanDrawBitmap() const { return TRUE; } virtual bool CanGetTextExtent() const { return TRUE; } protected: virtual void DoGetSize(int *width, int *height) const; - virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); + virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); @@ -69,7 +69,7 @@ protected: virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int logical_func = wxCOPY, bool useMask = FALSE ); + int logical_func = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ); virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, @@ -100,10 +100,6 @@ public: virtual void DestroyClippingRegion(); virtual void DoSetClippingRegionAsRegion( const wxRegion ®ion ); -#if wxUSE_SPLINES - virtual void DoDrawSpline( wxList *points ); -#endif - // Resolution in pixels per logical inch virtual wxSize GetPPI() const; virtual int GetDepth() const;