From a5cd619dbfbb5315b738645e3f1431073744239a Mon Sep 17 00:00:00 2001 From: John Luke Date: Fri, 16 Dec 2005 20:40:02 +0000 Subject: [PATCH] s/Graphics/Context svn path=/trunk/mcs/; revision=54543 --- mcs/class/Mono.Cairo/Samples/png/arc.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/arcneg.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/clip.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/clip_img.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/curve_rect.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/curve_to.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/fillstroke.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/gradient.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/image.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/image_pattern.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/knockout.cs | 18 +++++++++--------- mcs/class/Mono.Cairo/Samples/png/pattern_fill.cs | 4 ++-- mcs/class/Mono.Cairo/Samples/png/text.cs | 4 ++-- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/mcs/class/Mono.Cairo/Samples/png/arc.cs b/mcs/class/Mono.Cairo/Samples/png/arc.cs index ee7548d859b..ebaa2c9f5b6 100644 --- a/mcs/class/Mono.Cairo/Samples/png/arc.cs +++ b/mcs/class/Mono.Cairo/Samples/png/arc.cs @@ -34,7 +34,7 @@ public class CairoTest { static readonly double M_PI = 3.14159265358979323846; - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { double xc = 0.5; double yc = 0.5; @@ -65,7 +65,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/arcneg.cs b/mcs/class/Mono.Cairo/Samples/png/arcneg.cs index ecf62777436..628467b78ee 100644 --- a/mcs/class/Mono.Cairo/Samples/png/arcneg.cs +++ b/mcs/class/Mono.Cairo/Samples/png/arcneg.cs @@ -34,7 +34,7 @@ public class CairoTest { static readonly double M_PI = 3.14159265358979323846; - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { double xc = 0.5; double yc = 0.5; @@ -64,7 +64,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/clip.cs b/mcs/class/Mono.Cairo/Samples/png/clip.cs index 23ba79c7c78..a4a0f09c1dd 100644 --- a/mcs/class/Mono.Cairo/Samples/png/clip.cs +++ b/mcs/class/Mono.Cairo/Samples/png/clip.cs @@ -34,7 +34,7 @@ public class CairoTest { static readonly double M_PI = 3.14159265358979323846; - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { gr.Scale (width, height); gr.LineWidth = 0.04; @@ -57,7 +57,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/clip_img.cs b/mcs/class/Mono.Cairo/Samples/png/clip_img.cs index 1cc033a4fba..06a9970e35d 100644 --- a/mcs/class/Mono.Cairo/Samples/png/clip_img.cs +++ b/mcs/class/Mono.Cairo/Samples/png/clip_img.cs @@ -34,7 +34,7 @@ public class CairoTest { static readonly double M_PI = 3.14159265358979323846; - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { int w, h; ImageSurface image; @@ -74,7 +74,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/curve_rect.cs b/mcs/class/Mono.Cairo/Samples/png/curve_rect.cs index adf1d7c32ea..d58833ee7eb 100644 --- a/mcs/class/Mono.Cairo/Samples/png/curve_rect.cs +++ b/mcs/class/Mono.Cairo/Samples/png/curve_rect.cs @@ -33,7 +33,7 @@ using Cairo; public class CairoTest { - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { double x0 = 0.1; double y0 = 0.1; @@ -168,7 +168,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/curve_to.cs b/mcs/class/Mono.Cairo/Samples/png/curve_to.cs index fa09b2177b6..e4aa5ba8fa7 100644 --- a/mcs/class/Mono.Cairo/Samples/png/curve_to.cs +++ b/mcs/class/Mono.Cairo/Samples/png/curve_to.cs @@ -33,7 +33,7 @@ using Cairo; public class CairoTest { - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { double x=0.1, y=0.5; double x1=0.4, y1=0.9, x2=0.6, y2=0.1, x3=0.9, y3=0.5; @@ -63,7 +63,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/fillstroke.cs b/mcs/class/Mono.Cairo/Samples/png/fillstroke.cs index dc89c3a5378..e7e90b200ad 100644 --- a/mcs/class/Mono.Cairo/Samples/png/fillstroke.cs +++ b/mcs/class/Mono.Cairo/Samples/png/fillstroke.cs @@ -33,7 +33,7 @@ using Cairo; public class CairoTest { - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { gr.Scale (width, height); gr.LineWidth = 0.04; @@ -62,7 +62,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/gradient.cs b/mcs/class/Mono.Cairo/Samples/png/gradient.cs index 611fff39c14..a1154e9adbf 100644 --- a/mcs/class/Mono.Cairo/Samples/png/gradient.cs +++ b/mcs/class/Mono.Cairo/Samples/png/gradient.cs @@ -36,7 +36,7 @@ public class CairoTest - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { gr.Scale (width, height); gr.LineWidth = 0.04; @@ -67,7 +67,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/image.cs b/mcs/class/Mono.Cairo/Samples/png/image.cs index a00084d9457..5659d14075b 100644 --- a/mcs/class/Mono.Cairo/Samples/png/image.cs +++ b/mcs/class/Mono.Cairo/Samples/png/image.cs @@ -36,7 +36,7 @@ public class CairoTest - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { int w, h; ImageSurface image; @@ -60,7 +60,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/image_pattern.cs b/mcs/class/Mono.Cairo/Samples/png/image_pattern.cs index 3dd190276eb..ea27484b28d 100644 --- a/mcs/class/Mono.Cairo/Samples/png/image_pattern.cs +++ b/mcs/class/Mono.Cairo/Samples/png/image_pattern.cs @@ -34,7 +34,7 @@ public class CairoTest { static readonly double M_PI = 3.14159265358979323846; - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { int w, h; ImageSurface image; @@ -74,7 +74,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/knockout.cs b/mcs/class/Mono.Cairo/Samples/png/knockout.cs index b11b636a00d..e4a373235f5 100644 --- a/mcs/class/Mono.Cairo/Samples/png/knockout.cs +++ b/mcs/class/Mono.Cairo/Samples/png/knockout.cs @@ -3,7 +3,7 @@ using Cairo; class Knockout { - void OvalPath (Graphics ctx, double xc, double yc, double xr, double yr) + void OvalPath (Context ctx, double xc, double yc, double xr, double yr) { Matrix m = ctx.Matrix; @@ -16,7 +16,7 @@ class Knockout ctx.Matrix = m; } - void FillChecks (Graphics ctx, int x, int y, int width, int height) + void FillChecks (Context ctx, int x, int y, int width, int height) { int CHECK_SIZE = 32; @@ -24,7 +24,7 @@ class Knockout Surface check = ctx.Target.CreateSimilar (Content.Color, 2 * CHECK_SIZE, 2 * CHECK_SIZE); // draw the check - Graphics cr2 = new Graphics (check); + Context cr2 = new Context (check); cr2.Operator = Operator.Source; cr2.Color = new Color (0.4, 0.4, 0.4); cr2.Rectangle (0, 0, 2 * CHECK_SIZE, 2 * CHECK_SIZE); @@ -50,7 +50,7 @@ class Knockout ctx.Restore (); } - void Draw3Circles (Graphics ctx, int xc, int yc, double radius, double alpha) + void Draw3Circles (Context ctx, int xc, int yc, double radius, double alpha) { double subradius = radius * (2 / 3.0 - 0.1); @@ -67,7 +67,7 @@ class Knockout ctx.Fill (); } - void Draw (Graphics ctx, int width, int height) + void Draw (Context ctx, int width, int height) { double radius = 0.5 * Math.Min (width, height) - 10; int xc = width / 2; @@ -81,14 +81,14 @@ class Knockout ctx.Save (); // Draw a black circle on the overlay - Graphics cr_overlay = new Graphics (overlay); + Context cr_overlay = new Context (overlay); cr_overlay.Color = new Color (0.0, 0.0, 0.0); OvalPath (cr_overlay, xc, yc, radius, radius); cr_overlay.Fill (); // Draw 3 circles to the punch surface, then cut // that out of the main circle in the overlay - Graphics cr_tmp = new Graphics (punch); + Context cr_tmp = new Context (punch); Draw3Circles (cr_tmp, xc, yc, radius, 1.0); //cr_tmp.Destroy (); @@ -99,7 +99,7 @@ class Knockout // Now draw the 3 circles in a subgroup again // at half intensity, and use OperatorAdd to join up // without seams. - Graphics cr_circles = new Graphics (circles); + Context cr_circles = new Context (circles); cr_circles.Operator = Operator.Over; Draw3Circles (cr_circles, xc, yc, radius, 0.5); // cr_circles.Destroy (); @@ -125,7 +125,7 @@ class Knockout Knockout () { Surface s = new ImageSurface (Format.ARGB32, 400, 400); - Graphics ctx = new Graphics (s); + Context ctx = new Context (s); Draw (ctx, 400, 400); s.WriteToPng ("knockout.png"); } diff --git a/mcs/class/Mono.Cairo/Samples/png/pattern_fill.cs b/mcs/class/Mono.Cairo/Samples/png/pattern_fill.cs index 835eb8f5a85..4f20d817471 100644 --- a/mcs/class/Mono.Cairo/Samples/png/pattern_fill.cs +++ b/mcs/class/Mono.Cairo/Samples/png/pattern_fill.cs @@ -34,7 +34,7 @@ public class CairoTest { static readonly double M_PI = 3.14159265358979323846; - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { //gr.Scale (width, height); //gr.LineWidth = 0.04; @@ -136,7 +136,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); diff --git a/mcs/class/Mono.Cairo/Samples/png/text.cs b/mcs/class/Mono.Cairo/Samples/png/text.cs index 7a311e0a469..1efdefe2cfe 100644 --- a/mcs/class/Mono.Cairo/Samples/png/text.cs +++ b/mcs/class/Mono.Cairo/Samples/png/text.cs @@ -34,7 +34,7 @@ public class CairoTest { static readonly double M_PI = 3.14159265358979323846; - static void draw (Cairo.Graphics gr, int width, int height) + static void draw (Cairo.Context gr, int width, int height) { gr.Scale (width, height); gr.LineWidth = 0.04; @@ -62,7 +62,7 @@ public class CairoTest static void Main () { Surface s = new ImageSurface (Format.ARGB32, 500, 500); - Cairo.Graphics g = new Cairo.Graphics (s); + Cairo.Context g = new Cairo.Context (s); draw (g, 500, 500); -- 2.11.4.GIT