2005-10-24 Peter Dennis Bartok <pbartok@novell.com>

[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 6d45325895d318ade4080da2299186ea87365fb0..1760c92be3bc51893f30722d523b4538437d1ecf 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Size.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Size.cs
@@ -4,17 +4,48 @@
 // Author:
 //   Mike Kestner (mkestner@speakeasy.net)
 //
-// (C) Ximian, Inc.  http://www.ximian.com
+// 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;
+using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
 
-namespace System.Drawing {
-       
-       public struct Size { 
+namespace System.Drawing
+{
+       [Serializable]
+       [ComVisible (true)]
+       [TypeConverter (typeof (SizeConverter))]
+       public struct Size
+       { 
                
-               // Private height and width fields.
-               int wd, ht;
+               // Private Height and width fields.
+               private int width, height;
 
                // -----------------------
                // Public Shared Members
@@ -193,8 +224,8 @@ namespace System.Drawing {
                
                public Size (Point pt)
                {
-                       wd = pt.X;
-                       ht = pt.Y;
+                       width = pt.X;
+                       height = pt.Y;
                }
 
                /// <summary>
@@ -207,8 +238,8 @@ namespace System.Drawing {
                
                public Size (int width, int height)
                {
-                       wd = width;
-                       ht = height;
+                       this.width = width;
+                       this.height = height;
                }
 
                // -----------------------
@@ -223,9 +254,10 @@ namespace System.Drawing {
                ///     Indicates if both Width and Height are zero.
                /// </remarks>
                
+               [Browsable (false)]
                public bool IsEmpty {
                        get {
-                               return ((wd == 0) && (ht == 0));
+                               return ((width == 0) && (height == 0));
                        }
                }
 
@@ -239,10 +271,10 @@ namespace System.Drawing {
                
                public int Width {
                        get {
-                               return wd;
+                               return width;
                        }
                        set {
-                               wd = value;
+                               width = value;
                        }
                }
 
@@ -256,10 +288,10 @@ namespace System.Drawing {
                
                public int Height {
                        get {
-                               return ht;
+                               return height;
                        }
                        set {
-                               ht = value;
+                               height = value;
                        }
                }
 
@@ -289,7 +321,7 @@ namespace System.Drawing {
                
                public override int GetHashCode ()
                {
-                       return wd^ht;
+                       return width^height;
                }
 
                /// <summary>
@@ -302,7 +334,7 @@ namespace System.Drawing {
                
                public override string ToString ()
                {
-                       return String.Format ("[{0},{1}]", wd, ht);
+                       return String.Format ("{{Width={0}, Height={1}}}", width, height);
                }
 
        }