* Point.cs: Use invariant culture for converting numbers to string.

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

diff --git a/mcs/class/System.Drawing/System.Drawing/PointF.cs b/mcs/class/System.Drawing/System.Drawing/PointF.cs
index 8397aa38048f944af750074ec4a855a78b401713..62d62ccf9cf39f72b1d717713973c4da1acacd35 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/PointF.cs
+++ b/mcs/class/System.Drawing/System.Drawing/PointF.cs
@@ -4,17 +4,46 @@
 // 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
 //
 
-using System;
+//
+// 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.
+//
 
-namespace System.Drawing {
-       
-       public struct PointF { 
-               
+using System;\r
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
+
+namespace System.Drawing
+{
+       [Serializable]
+       [ComVisible (true)]
+       public struct PointF
+       {
                // Private x and y coordinate fields.
-               float cx, cy;
+               private float x, y;
 
                // -----------------------
                // Public Shared Members
@@ -102,8 +131,8 @@ namespace System.Drawing {
                
                public PointF (float x, float y)
                {
-                       cx = x;
-                       cy = y;
+                       this.x = x;
+                       this.y = y;
                }
 
                // -----------------------
@@ -118,9 +147,10 @@ namespace System.Drawing {
                ///     Indicates if both X and Y are zero.
                /// </remarks>
                
+               [Browsable (false)]
                public bool IsEmpty {
                        get {
-                               return ((cx == 0.0) && (cy == 0.0));
+                               return ((x == 0.0) && (y == 0.0));
                        }
                }
 
@@ -134,10 +164,10 @@ namespace System.Drawing {
                
                public float X {
                        get {
-                               return cx;
+                               return x;
                        }
                        set {
-                               cx = value;
+                               x = value;
                        }
                }
 
@@ -151,10 +181,10 @@ namespace System.Drawing {
                
                public float Y {
                        get {
-                               return cy;
+                               return y;
                        }
                        set {
-                               cy = value;
+                               y = value;
                        }
                }
 
@@ -184,7 +214,7 @@ namespace System.Drawing {
                
                public override int GetHashCode ()
                {
-                       return (int) cx ^ (int) cy;
+                       return (int) x ^ (int) y;
                }
 
                /// <summary>
@@ -196,9 +226,9 @@ namespace System.Drawing {
                /// </remarks>
                
                public override string ToString ()
-               {
-                       return String.Format ("[{0},{1}]", cx, cy);
+               {\r
+                       return String.Format ("{{X={0}, Y={1}}}", x.ToString (CultureInfo.InvariantCulture),\r
+                               y.ToString (CultureInfo.InvariantCulture));
                }
-
        }
 }