X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b77c3fce750925bdd0cb33505439ddc5493a18e..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/x11/dcclient.h diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h index 928edfaf56..9850e700ca 100644 --- a/include/wx/x11/dcclient.h +++ b/include/wx/x11/dcclient.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcclient.h +// Name: wx/x11/dcclient.h // Purpose: wxClientDC, wxPaintDC and wxWindowDC classes // Author: Julian Smart // Modified by: @@ -32,7 +32,7 @@ class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxX11DCImpl public: wxWindowDCImpl( wxDC *owner ); wxWindowDCImpl( wxDC *owner, wxWindow *win ); - + virtual ~wxWindowDCImpl(); virtual bool CanDrawBitmap() const { return true; } @@ -40,7 +40,8 @@ public: protected: virtual void DoGetSize(int *width, int *height) const; - virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE ); + virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, + wxFloodFillStyle style = wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const; virtual void DoDrawPoint(wxCoord x, wxCoord y); @@ -69,17 +70,18 @@ protected: virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); + wxRasterOperationMode rop = wxCOPY, bool useMask = false, + wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); - virtual void DoSetClippingRegionAsRegion(const wxRegion& region); virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + virtual void DoSetDeviceClippingRegion(const wxRegion& region); virtual void DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset); virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, - int fillStyle = wxODDEVEN_RULE); + wxPolygonFillMode fillStyle = wxODDEVEN_RULE); public: @@ -91,7 +93,7 @@ public: virtual void SetBackground(const wxBrush& brush); virtual void SetBackgroundMode(int mode); virtual void SetPalette(const wxPalette& palette); - virtual void SetLogicalFunction( int function ); + virtual void SetLogicalFunction( wxRasterOperationMode function ); virtual void SetTextForeground(const wxColour& colour); virtual void SetTextBackground(const wxColour& colour); @@ -103,7 +105,7 @@ public: virtual wxSize GetPPI() const; virtual void DestroyClippingRegion(); - WXWindow GetWindow() const { return m_window; } + WXWindow GetX11Window() const { return m_x11window; } virtual void ComputeScaleAndOrigin();