X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaad94e75273fa586ec9af9d53518222f9699d0..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/dcmirror.h?ds=sidebyside diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h index 7ab8d88f25..d64f5004bc 100644 --- a/include/wx/dcmirror.h +++ b/include/wx/dcmirror.h @@ -53,7 +53,7 @@ public: virtual int GetDepth() const { return m_dc.GetDepth(); } virtual wxSize GetPPI() const { return m_dc.GetPPI(); } virtual bool IsOk() const { return m_dc.IsOk(); } - virtual void SetMapMode(int mode) { m_dc.SetMapMode(mode); } + virtual void SetMapMode(wxMappingMode mode) { m_dc.SetMapMode(mode); } virtual void SetUserScale(double x, double y) { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); } virtual void SetLogicalOrigin(wxCoord x, wxCoord y) @@ -63,7 +63,7 @@ public: virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) { m_dc.SetAxisOrientation(GetX(xLeftRight, yBottomUp), GetY(xLeftRight, yBottomUp)); } - virtual void SetLogicalFunction(int function) + virtual void SetLogicalFunction(wxRasterOperationMode function) { m_dc.SetLogicalFunction(function); } protected: @@ -102,7 +102,7 @@ protected: // wxDCBase functions virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - int style = wxFLOOD_SURFACE) + wxFloodFillStyle style = wxFLOOD_SURFACE) { return m_dc.DoFloodFill(GetX(x, y), GetY(x, y), col, style); } @@ -202,7 +202,8 @@ protected: virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord w, wxCoord h, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop = wxCOPY, bool useMask = false, + wxRasterOperationMode rop = wxCOPY, + bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) { return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest), @@ -235,7 +236,7 @@ protected: virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, - int fillStyle = wxODDEVEN_RULE) + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) { Mirror(n, points); @@ -272,7 +273,7 @@ private: bool m_mirror; - DECLARE_NO_COPY_CLASS(wxMirrorDCImpl) + wxDECLARE_NO_COPY_CLASS(wxMirrorDCImpl); }; class WXDLLIMPEXP_CORE wxMirrorDC : public wxDC @@ -293,7 +294,7 @@ public: private: bool m_mirror; - DECLARE_NO_COPY_CLASS(wxMirrorDC) + wxDECLARE_NO_COPY_CLASS(wxMirrorDC); }; #endif // _WX_DCMIRROR_H_