Merge pull request #4723 from lambdageek/bug-54485

[mono.git] / mcs / class / Mono.Cairo / Mono.Cairo / Context.cs

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs b/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
index 1eff46c1ec19e6c177469166a5e07290c456db03..7ca0dee45dd5f5ee5ebb41c273fc1c3373d62297 100644 (file)
--- a/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
+++ b/mcs/class/Mono.Cairo/Mono.Cairo/Context.cs
@@ -161,10 +161,10 @@ namespace Cairo {
                        }
                }
 
-               [Obsolete ("Use SetSourceRGBA method")]
+               [Obsolete ("Use SetSourceColor method")]
                public Color Color {
                        set {
-                               NativeMethods.cairo_set_source_rgba (handle, value.R, value.G, value.B, value.A);
+                               SetSourceColor (value);
                        }
                }
 
@@ -230,7 +230,7 @@ namespace Cairo {
                        NativeMethods.cairo_set_dash (handle, dashes, dashes.Length, offset);
                }
 
-               [Obsolete("Use GetSource/GetSource")]
+               [Obsolete("Use GetSource/SetSource")]
                public Pattern Pattern {
                        set {
                                SetSource (value);
@@ -241,7 +241,7 @@ namespace Cairo {
                }
 
                //This is obsolete because it wasn't obvious it needed to be disposed
-               [Obsolete("Use GetSource/GetSource")]
+               [Obsolete("Use GetSource/SetSource")]
                public Pattern Source {
                        set {
                                SetSource (value);
@@ -280,6 +280,12 @@ namespace Cairo {
                        }
                }
 
+               public bool HasCurrentPoint {
+                       get {
+                               return NativeMethods.cairo_has_current_point (handle);
+                       }
+               }
+
                [Obsolete ("Use GetTarget/SetTarget")]
                public Cairo.Surface Target {
                        set {
@@ -331,6 +337,11 @@ namespace Cairo {
                        get { return NativeMethods.cairo_get_reference_count (handle); }
                }
 
+               public void SetSourceColor (Color color)
+               {
+                       NativeMethods.cairo_set_source_rgba (handle, color.R, color.G, color.B, color.A);
+               }
+
                public void SetSourceRGB (double r, double g, double b)
                {
                        NativeMethods.cairo_set_source_rgb (handle, r, g, b);
@@ -548,6 +559,11 @@ namespace Cairo {
                        NativeMethods.cairo_reset_clip (handle);
                }
 
+               public bool InClip (double x, double y)
+               {
+                       return NativeMethods.cairo_in_clip (handle, x, y);
+               }
+
                public bool InStroke (double x, double y)
                {
                        return NativeMethods.cairo_in_stroke (handle, x, y);