diff --git a/src/util/rotation.cpp b/src/util/rotation.cpp index e609c420..747a0a55 100644 --- a/src/util/rotation.cpp +++ b/src/util/rotation.cpp @@ -332,7 +332,7 @@ void RotatedDC::DrawEllipticSpoke(const RealPoint& center, const RealSize& size, void RotatedDC::SetPen(const wxPen& pen) { dc.SetPen(pen); } void RotatedDC::SetBrush(const wxBrush& brush) { dc.SetBrush(brush); } void RotatedDC::SetTextForeground(const Color& color) { dc.SetTextForeground(color); } -void RotatedDC::SetLogicalFunction(int function) { dc.SetLogicalFunction(function); } +void RotatedDC::SetLogicalFunction(wxRasterOperationMode function) { dc.SetLogicalFunction(function); } void RotatedDC::SetFont(const wxFont& font) { if (quality == QUALITY_LOW && zoomX == 1 && zoomY == 1) { @@ -391,7 +391,7 @@ double RotatedDC::GetCharHeight() const { } void RotatedDC::SetClippingRegion(const RealRect& rect) { - dc.SetClippingRegion(trRectToRegion(rect)); + dc.SetDeviceClippingRegion(trRectToRegion(rect)); } void RotatedDC::DestroyClippingRegion() { dc.DestroyClippingRegion(); diff --git a/src/util/rotation.hpp b/src/util/rotation.hpp index e70b1778..47e2c5ef 100644 --- a/src/util/rotation.hpp +++ b/src/util/rotation.hpp @@ -155,6 +155,11 @@ enum RenderQuality { QUALITY_AA, ///< Our own anti aliassing }; +#if wxVERSION_NUMBER < 2900 + // argument type to SetLogicalFunction + typedef int wxRasterOperationMode; +#endif + /// A DC with rotation applied /** All draw** functions take internal coordinates. */ @@ -198,7 +203,7 @@ class RotatedDC : public Rotation { void SetPen(const wxPen&); void SetBrush(const wxBrush&); void SetTextForeground(const Color&); - void SetLogicalFunction(int function); + void SetLogicalFunction(wxRasterOperationMode function); void SetFont(const wxFont& font); /// Set the font, scales for zoom and high_quality