partially fix sample

svn path=/trunk/mcs/; revision=49592

diff --git a/mcs/class/Mono.Cairo/ChangeLog b/mcs/class/Mono.Cairo/ChangeLog
index 08349069c52c2327431ab2995703f08a2a57ae28..da6076c754c5df6887a2b35cf16da8bc091879d4 100644 (file)
--- a/mcs/class/Mono.Cairo/ChangeLog
+++ b/mcs/class/Mono.Cairo/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-06  John Luke  <john.luke@gmail.com>
+
+       * Samples/gtk/circles.cs: fix partially broken sample
+
 2005-09-06  John Luke  <john.luke@gmail.com>
 
        * Mono.Cairo/Surface.cs: make CreateSimilar non-static

diff --git a/mcs/class/Mono.Cairo/Samples/gtk/circles.cs b/mcs/class/Mono.Cairo/Samples/gtk/circles.cs
index 1b36a9d7e18c3dd4d99bcec4fa8a1634bc2fdca1..4ef11d8fc3727e48ef8846919ebf7d0a9559f0b6 100644 (file)
--- a/mcs/class/Mono.Cairo/Samples/gtk/circles.cs
+++ b/mcs/class/Mono.Cairo/Samples/gtk/circles.cs
@@ -29,8 +29,6 @@
 //
 
 using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
 using Cairo;
 using Gtk;
        
@@ -63,16 +61,11 @@ public class CairoGraphic : DrawingArea
    
        static void oval_path (Cairo.Graphics gr, double xc, double yc, double xr, double yr)
        {
-               Matrix matrix  = gr.Matrix;
-               
                gr.Translate (xc, yc);
                gr.Scale (1.0, yr / xr);
                gr.MoveTo (new PointD (xr, 0.0) );
                gr.Arc (0, 0, xr, 0, 2 * M_PI);
                gr.ClosePath ();
-               
-               gr.Matrix = matrix;
-               //matrix.Destroy();
        }
        
        /* 
@@ -119,12 +112,13 @@ public class CairoGraphic : DrawingArea
                double xc = width / 2;
                double yc = height / 2;
                
-               overlay = Surface.CreateSimilar (gr.TargetSurface, Format.ARGB32, width, height);               
-               punch = Surface.CreateSimilar (gr.TargetSurface, Format.A8, width, height);             
-               circles = Surface.CreateSimilar (gr.TargetSurface, Format.ARGB32, width, height);
+               Surface target = gr.Target;
+               overlay = target.CreateSimilar (Content.ColorAlpha, width, height);             
+               punch = target.CreateSimilar (Content.Alpha, width, height);            
+               circles = target.CreateSimilar (Content.ColorAlpha, width, height);
                
                gr.Save ();
-               gr.TargetSurface = overlay;
+               gr.Target = overlay;
                
                /* Draw a black circle on the overlay
                */
@@ -134,7 +128,7 @@ public class CairoGraphic : DrawingArea
                oval_path (gr, xc, yc, radius, radius);
                gr.Fill ();             
                gr.Save ();
-               gr.TargetSurface =  punch;
+               gr.Target =  punch;
                
                
                /* Draw 3 circles to the punch surface, then cut
@@ -144,8 +138,7 @@ public class CairoGraphic : DrawingArea
                
                gr.Restore ();
                
-               // FIXME: Operator.OutReverse is not in cairo 1.0
-               //gr.Operator = Operator.OutReverse;
+               gr.Operator = Operator.DestOut;
                punch.Show (gr, width, height);
                
                
@@ -154,7 +147,7 @@ public class CairoGraphic : DrawingArea
                * without seams.
                */
                gr.Save ();
-               gr.TargetSurface =  circles;
+               gr.Target =  circles;
                
                //gr.Alpha = 0.5;
                gr.Operator = Operator.Over;