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 338141463705aae4d59724ac36d59213a5e5c989..2ff07c378037e47b98d708b9e4c29db207b4eb2a 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Size.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Size.cs
@@ -4,7 +4,31 @@
 // Author:
 //   Mike Kestner (mkestner@speakeasy.net)
 //
-// (C) 2001 Mike Kestner
+// Copyright (C) 2001 Mike Kestner
+// Copyright (C) 2004 Novell, Inc. http://www.novell.com
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
 using System;
@@ -12,15 +36,16 @@ using System.Runtime.Serialization;
 using System.Runtime.InteropServices;
 using System.ComponentModel;
 
-namespace System.Drawing {
-       
+namespace System.Drawing
+{
        [Serializable]
        [ComVisible (true)]
-       [TypeConverter(typeof(SizeConverter))]
-       public struct Size { 
+       [TypeConverter (typeof (SizeConverter))]
+       public struct Size
+       { 
                
                // Private Height and width fields.
-               int width, height;
+               private int width, height;
 
                // -----------------------
                // Public Shared Members
@@ -120,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>
@@ -136,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>
@@ -165,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>
@@ -179,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);
                }
 
 
@@ -229,6 +254,7 @@ namespace System.Drawing {
                ///     Indicates if both Width and Height are zero.
                /// </remarks>
                
+               [Browsable (false)]
                public bool IsEmpty {
                        get {
                                return ((width == 0) && (height == 0));
@@ -277,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>
@@ -311,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
+
        }
 }