2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[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 1aa0155c56dcadc31293d57143cbc030e47ca759..18598036629ff4758ec7a4c4b9c251899ec86e87 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/SizeF.cs
+++ b/mcs/class/System.Drawing/System.Drawing/SizeF.cs
@@ -4,17 +4,45 @@
 // 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;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
 
-namespace System.Drawing {
-       
-       public struct SizeF { 
-               
+namespace System.Drawing
+{
+       [Serializable]
+       [ComVisible (true)]
+       public struct SizeF
+       {
                // Private height and width fields.
-               float wd, ht;
+               private float wd, ht;
 
                // -----------------------
                // Public Shared Members
@@ -163,6 +191,7 @@ namespace System.Drawing {
                ///     Indicates if both Width and Height are zero.
                /// </remarks>
                
+               [Browsable (false)]
                public bool IsEmpty {
                        get {
                                return ((wd == 0.0) && (ht == 0.0));
@@ -232,6 +261,22 @@ namespace System.Drawing {
                        return (int) wd ^ (int) ht;
                }
 
+               public PointF ToPointF ()
+               {
+                       return new PointF (wd, ht);
+               }
+
+               public Size ToSize ()
+               {
+                       int w, h;
+                       checked {
+                               w = (int) wd;
+                               h = (int) ht;
+                       }
+
+                       return new Size (w, h);
+               }
+
                /// <summary>
                ///     ToString Method
                /// </summary>
@@ -242,8 +287,7 @@ namespace System.Drawing {
                
                public override string ToString ()
                {
-                       return String.Format ("[{0},{1}]", wd, ht);
+                       return String.Format ("{{Width={0}, Height={1}}}", wd, ht);
                }
-
        }
 }