[System.Drawing] Add ifdefs to source code used by Xamarin.iOS/Mac to make it compile...

[mono.git] / mcs / class / System.Drawing / System.Drawing / SizeF.cs

diff --git a/mcs/class/System.Drawing/System.Drawing/SizeF.cs b/mcs/class/System.Drawing/System.Drawing/SizeF.cs
index acaebb55670883db6bbc054a7c63521dc38cd4e8..38714d1c9968f30ae18e363a4c811a82dc38de99 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SizeF.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SizeF.cs
@@ -40,7 +40,7 @@ namespace System.Drawing
 {
        [Serializable]
        [ComVisible (true)]
-#if NET_2_0
+#if !MONOTOUCH && !MONOMAC
        [TypeConverter (typeof (SizeFConverter))]
 #endif
        public struct SizeF
@@ -86,10 +86,10 @@ namespace System.Drawing
                ///     properties of the two Sizes.
                /// </remarks>
 
-               public static bool operator == (SizeF sz_a, SizeF sz_b)
+               public static bool operator == (SizeF sz1, SizeF sz2)
                {
-                       return ((sz_a.Width == sz_b.Width) && 
-                               (sz_a.Height == sz_b.Height));
+                       return ((sz1.Width == sz2.Width) && 
+                               (sz1.Height == sz2.Height));
                }
                
                /// <summary>
@@ -102,10 +102,10 @@ namespace System.Drawing
                ///     properties of the two Sizes.
                /// </remarks>
 
-               public static bool operator != (SizeF sz_a, SizeF sz_b)
+               public static bool operator != (SizeF sz1, SizeF sz2)
                {
-                       return ((sz_a.Width != sz_b.Width) || 
-                               (sz_a.Height != sz_b.Height));
+                       return ((sz1.Width != sz2.Width) || 
+                               (sz1.Height != sz2.Height));
                }
                
                /// <summary>
@@ -131,9 +131,9 @@ namespace System.Drawing
                ///     SizeF. Requires explicit cast.
                /// </remarks>
 
-               public static explicit operator PointF (SizeF sz)
+               public static explicit operator PointF (SizeF size)
                {
-                       return new PointF (sz.Width, sz.Height);
+                       return new PointF (size.Width, size.Height);
                }
 
 
@@ -163,10 +163,10 @@ namespace System.Drawing
                ///     Creates a SizeF from an existing SizeF value.
                /// </remarks>
                
-               public SizeF (SizeF sz)
+               public SizeF (SizeF size)
                {
-                       width = sz.Width;
-                       height = sz.Height;
+                       width = size.Width;
+                       height = size.Height;
                }
 
                /// <summary>
@@ -244,12 +244,12 @@ namespace System.Drawing
                ///     Checks equivalence of this SizeF and another object.
                /// </remarks>
                
-               public override bool Equals (object o)
+               public override bool Equals (object obj)
                {
-                       if (!(o is SizeF))
+                       if (!(obj is SizeF))
                                return false;
 
-                       return (this == (SizeF) o);
+                       return (this == (SizeF) obj);
                }
 
                /// <summary>
@@ -295,7 +295,6 @@ namespace System.Drawing
                                height.ToString (CultureInfo.CurrentCulture));
                }
 
-#if NET_2_0
                public static SizeF Add (SizeF sz1, SizeF sz2)
                {
                        return new SizeF (sz1.Width + sz2.Width, 
@@ -307,6 +306,5 @@ namespace System.Drawing
                        return new SizeF (sz1.Width - sz2.Width, 
                                          sz1.Height - sz2.Height);
                }
-#endif
        }
 }