X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk/dcclient.h diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h index 564975c655..53469796a1 100644 --- a/include/wx/gtk/dcclient.h +++ b/include/wx/gtk/dcclient.h @@ -1,8 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.h +// Name: wx/gtk/dcclient.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,10 +10,6 @@ #define _WX_GTKDCCLIENT_H_ #include "wx/gtk/dc.h" -#include "wx/dcclient.h" -#include "wx/region.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; //----------------------------------------------------------------------------- // wxWindowDCImpl @@ -32,7 +27,7 @@ public: virtual bool CanGetTextExtent() const { return true; } virtual void DoGetSize(int *width, int *height) const; - virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, + virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, wxFloodFillStyle style=wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; @@ -44,9 +39,9 @@ public: double sa, double ea ); virtual void DoDrawPoint( wxCoord x, wxCoord y ); - virtual void DoDrawLines(int n, wxPoint points[], + virtual void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset); - virtual void DoDrawPolygon(int n, wxPoint points[], + virtual void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle = wxODDEVEN_RULE); @@ -58,11 +53,11 @@ public: virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, bool useMask = false ); - virtual bool DoBlit( wxCoord xdest, wxCoord ydest, + virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logical_func = wxCOPY, - bool useMask = false, + wxRasterOperationMode logical_func = wxCOPY, + bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );