[f-spot: 29/41] drop Obsoletes

[Stephane Delcroix <sdelcroix src gnome org>]

commit ea9cb7ba296f9b6a82a23a36b19660e85983b099
Author: Stephane Delcroix <stephane delcroix org>
Date:   Thu Jun 11 14:20:41 2009 +0200

    drop Obsoletes

 src/PhotoImageView.cs    |   11 +++--------
 src/Widgets/ImageView.cs |   16 +++-------------
 2 files changed, 6 insertions(+), 21 deletions(-)
---
diff --git a/src/PhotoImageView.cs b/src/PhotoImageView.cs
index 2458121..2d9dd63 100644
--- a/src/PhotoImageView.cs
+++ b/src/PhotoImageView.cs
@@ -217,12 +217,7 @@ namespace FSpot.Widgets {
 
 
 		public double Zoom {
-			get {
-				double x, y;
-				this.GetZoom (out x, out y);
-				return x;
-			}
-			
+			get { return base.Zoom; }
 			set {
 				//Console.WriteLine ("Setting zoom to {0}, MIN = {1}", value, MIN_ZOOM);
 				value = System.Math.Min (value, MAX_ZOOM);
@@ -239,7 +234,7 @@ namespace FSpot.Widgets {
 					this.Fit = true;
 				else {
 					this.Fit = false;
-					this.SetZoom (value, value);
+					base.Zoom = value;
 				}
 			}
 		}
@@ -374,7 +369,7 @@ namespace FSpot.Widgets {
 
 			double image_zoom = zoom_to_fit;
 
-			this.SetZoom (image_zoom, image_zoom);
+			base.Zoom = image_zoom;
 			
 			if (scrolled != null)
 				scrolled.SetPolicy (Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic);
diff --git a/src/Widgets/ImageView.cs b/src/Widgets/ImageView.cs
index 52d2f74..02615b6 100644
--- a/src/Widgets/ImageView.cs
+++ b/src/Widgets/ImageView.cs
@@ -29,7 +29,8 @@ namespace FSpot.Widgets
 		protected double MIN_ZOOM {
 			get { return min_zoom; }
 		}
-		
+
+#region public API
 		public ImageView () : base ()
 		{
 			OnSetScrollAdjustments (hadjustment, vadjustment);
@@ -124,22 +125,11 @@ namespace FSpot.Widgets
 			get { return zoom; }
 			set { DoZoom (value, false, 0, 0); }
 		}
+#endregion
 
 		int XOffset { get; set;}
 		int YOffset { get; set;}
 
-		[Obsolete ("use the Zoom Property")]
-		public void GetZoom (out double zoomx, out double zoomy)
-		{
-			zoomx = zoomy = Zoom;
-		}
-
-		[Obsolete ("use the Zoom Property, or ZoomAboutPoint method")]
-		public void SetZoom (double zoom_x, double zoom_y)
-		{
-			Zoom = zoom_x;
-		}
-
 		void DoZoom (double zoom, bool use_anchor, int x, int y)
 		{
 Console.WriteLine ("DoZoom {0} {1} {2} {3}", zoom, use_anchor, x, y);