Don't tag some CAS types as obsolete.

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

diff --git a/mcs/class/System.Drawing/System.Drawing/Size.cs b/mcs/class/System.Drawing/System.Drawing/Size.cs
index 1760c92be3bc51893f30722d523b4538437d1ecf..2ff07c378037e47b98d708b9e4c29db207b4eb2a 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Size.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Size.cs
@@ -145,10 +145,10 @@ namespace System.Drawing
                ///     properties of the two Sizes.
                /// </remarks>
 
-               public static bool operator == (Size sz_a, Size sz_b)
+               public static bool operator == (Size sz1, Size sz2)
                {
-                       return ((sz_a.Width == sz_b.Width) && 
-                               (sz_a.Height == sz_b.Height));
+                       return ((sz1.Width == sz2.Width) && 
+                               (sz1.Height == sz2.Height));
                }
                
                /// <summary>
@@ -161,10 +161,10 @@ namespace System.Drawing
                ///     properties of the two Sizes.
                /// </remarks>
 
-               public static bool operator != (Size sz_a, Size sz_b)
+               public static bool operator != (Size sz1, Size sz2)
                {
-                       return ((sz_a.Width != sz_b.Width) || 
-                               (sz_a.Height != sz_b.Height));
+                       return ((sz1.Width != sz2.Width) || 
+                               (sz1.Height != sz2.Height));
                }
                
                /// <summary>
@@ -190,9 +190,9 @@ namespace System.Drawing
                ///     Size. Requires explicit cast.
                /// </remarks>
 
-               public static explicit operator Point (Size sz)
+               public static explicit operator Point (Size size)
                {
-                       return new Point (sz.Width, sz.Height);
+                       return new Point (size.Width, size.Height);
                }
 
                /// <summary>
@@ -204,9 +204,9 @@ namespace System.Drawing
                ///     Size. No explicit cast is required.
                /// </remarks>
 
-               public static implicit operator SizeF (Size sz)
+               public static implicit operator SizeF (Size p)
                {
-                       return new SizeF (sz.Width, sz.Height);
+                       return new SizeF (p.Width, p.Height);
                }
 
 
@@ -303,12 +303,12 @@ namespace System.Drawing
                ///     Checks equivalence of this Size and another object.
                /// </remarks>
                
-               public override bool Equals (object o)
+               public override bool Equals (object obj)
                {
-                       if (!(o is Size))
+                       if (!(obj is Size))
                                return false;
 
-                       return (this == (Size) o);
+                       return (this == (Size) obj);
                }
 
                /// <summary>
@@ -337,5 +337,20 @@ namespace System.Drawing
                        return String.Format ("{{Width={0}, Height={1}}}", width, height);
                }
 
+#if NET_2_0
+               public static Size Add (Size sz1, Size sz2)
+               {
+                       return new Size (sz1.Width + sz2.Width, 
+                                        sz1.Height + sz2.Height);
+
+               }
+               
+               public static Size Subtract (Size sz1, Size sz2)
+               {
+                       return new Size (sz1.Width - sz2.Width, 
+                                        sz1.Height - sz2.Height);
+               }
+#endif
+
        }
 }