f-spot r4393 - in trunk/src: Editors/Old Utils Widgets

[rubenv svn gnome org]

Author: rubenv
Date: Wed Sep 17 11:23:19 2008
New Revision: 4393
URL: http://svn.gnome.org/viewvc/f-spot?rev=4393&view=rev

Log:
Fully obsolete CairoUtils.CreateContext.

Modified:
   trunk/src/Editors/Old/OldEditor.cs
   trunk/src/Utils/CairoUtils.cs
   trunk/src/Widgets/ImageDisplay.cs
   trunk/src/Widgets/PreviewPopup.cs

Modified: trunk/src/Editors/Old/OldEditor.cs
==============================================================================
--- trunk/src/Editors/Old/OldEditor.cs	(original)
+++ trunk/src/Editors/Old/OldEditor.cs	Wed Sep 17 11:23:19 2008
@@ -223,7 +223,7 @@
 		[GLib.ConnectBefore]
 		public virtual void ExposeEvent (object sender, ExposeEventArgs args)
 		{
-			Context ctx = CairoUtils.CreateContext (view.GdkWindow);
+			Context ctx = Gdk.CairoHelper.Create (view.GdkWindow);
 			Gdk.Color c = view.Style.Background (view.State);
 			ctx.Source = new SolidPattern (c.Red / (float) ushort.MaxValue,
 						       c.Blue / (float) ushort.MaxValue,

Modified: trunk/src/Utils/CairoUtils.cs
==============================================================================
--- trunk/src/Utils/CairoUtils.cs	(original)
+++ trunk/src/Utils/CairoUtils.cs	Wed Sep 17 11:23:19 2008
@@ -14,22 +14,6 @@
 
 namespace FSpot.Utils {
 	public class CairoUtils {
-		static class NativeMethods
-		{
-			[DllImport("libgdk-2.0-0.dll")]
-			public static extern IntPtr gdk_cairo_create (IntPtr raw);	
-		}
-		
-		[Obsolete ("use Gdk.CairoHelper.Create instead")]
-		public static Cairo.Context CreateContext (Gdk.Drawable drawable)
-		{
-			Cairo.Context ctx = new Cairo.Context (NativeMethods.gdk_cairo_create (drawable.Handle));
-			if (ctx == null) 
-				throw new Exception ("Couldn't create Cairo Graphics!");
-			
-			return ctx;
-		}
-
 		public static Surface CreateSurface (Gdk.Drawable d)
 		{
 			int width, height;

Modified: trunk/src/Widgets/ImageDisplay.cs
==============================================================================
--- trunk/src/Widgets/ImageDisplay.cs	(original)
+++ trunk/src/Widgets/ImageDisplay.cs	Wed Sep 17 11:23:19 2008
@@ -205,7 +205,7 @@
 			bool double_buffer = false;
 			base.OnExposeEvent (args);
 
-			Context ctx = CairoUtils.CreateContext (GdkWindow);
+			Context ctx = Gdk.CairoHelper.Create (GdkWindow);
 			//Surface glitz = CairoUtils.CreateGlitzSurface (GdkWindow);
 			//Context ctx = new Context (glitz);
 			if (double_buffer) {

Modified: trunk/src/Widgets/PreviewPopup.cs
==============================================================================
--- trunk/src/Widgets/PreviewPopup.cs	(original)
+++ trunk/src/Widgets/PreviewPopup.cs	Wed Sep 17 11:23:19 2008
@@ -80,7 +80,7 @@
 		protected override bool OnExposeEvent (Gdk.EventExpose args)
 		{
 			int round = 12;
-			Context g = CairoUtils.CreateContext (GdkWindow);
+			Context g = Gdk.CairoHelper.Create (GdkWindow);
 			g.Operator = Operator.Source;
 #if MONO_1_2_5
 			g.Source = new SolidPattern (new Cairo.Color (0, 0, 0, 0));