From 91426f2267af73f1c52fb7c449a6275ebb7e895b Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Mon, 24 Sep 2018 15:49:40 -0700 Subject: [PATCH] Workaround 'operator' as forbidden variable name in Haxe 4 dev --- src/lime/graphics/cairo/Cairo.hx | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/lime/graphics/cairo/Cairo.hx b/src/lime/graphics/cairo/Cairo.hx index 85ea20258..f61c77a76 100644 --- a/src/lime/graphics/cairo/Cairo.hx +++ b/src/lime/graphics/cairo/Cairo.hx @@ -23,6 +23,7 @@ class Cairo { public static var versionString (get, null):String; public var antialias (get, set):CairoAntialias; + public var blendMode (get, set):CairoOperator; public var currentPoint (get, never):Vector2; public var dash (get, set):Array; public var dashCount (get, never):Int; @@ -36,7 +37,9 @@ class Cairo { public var lineWidth (get, set):Float; public var matrix (get, set):Matrix3; public var miterLimit (get, set):Float; + #if (haxe_ver < "4.0.0") public var operator (get, set):CairoOperator; + #end public var source (get, set):CairoPattern; public var target (get, null):CairoSurface; public var tolerance (get, set):Float; @@ -551,6 +554,28 @@ class Cairo { } + @:noCompletion private function get_blendMode ():CairoOperator { + + #if (lime_cffi && lime_cairo && !macro) + return NativeCFFI.lime_cairo_get_operator (handle); + #end + + return cast 0; + + } + + + @:noCompletion private function set_blendMode (value:CairoOperator):CairoOperator { + + #if (lime_cffi && lime_cairo && !macro) + NativeCFFI.lime_cairo_set_operator (handle, value); + #end + + return value; + + } + + @:noCompletion private function get_currentPoint ():Vector2 { #if (lime_cffi && lime_cairo && !macro) @@ -823,6 +848,7 @@ class Cairo { } + #if (haxe_ver < "4.0.0") @:noCompletion private function get_operator ():CairoOperator { #if (lime_cffi && lime_cairo && !macro) @@ -843,6 +869,7 @@ class Cairo { return value; } + #end @:noCompletion private function get_source ():CairoPattern {