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

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

diff --git a/mcs/class/System.Drawing/System.Drawing/PointConverter.cs b/mcs/class/System.Drawing/System.Drawing/PointConverter.cs
index 04cf73c790aee7d66bbc9cf84a41436406ca6069..fac05d4ffa02f587f75897d771b6305282e3e2e1 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/PointConverter.cs
+++ b/mcs/class/System.Drawing/System.Drawing/PointConverter.cs
@@ -6,13 +6,35 @@
 //   Ravindra (rkumar@novell.com)
 //
 // Copyright (C) 2002 Ximian, Inc. http://www.ximian.com
-// 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.Collections;
 using System.ComponentModel;
 using System.Globalization;
+using System.ComponentModel.Design.Serialization;
+using System.Reflection;\r
 
 namespace System.Drawing
 {
@@ -38,6 +60,9 @@ namespace System.Drawing
                        if (destinationType == typeof (string))
                                return true;
 
+                       if (destinationType == typeof (InstanceDescriptor))
+                               return true;
+
                        return base.CanConvertTo (context, destinationType);
                }
 
@@ -49,6 +74,7 @@ namespace System.Drawing
                        if (s == null)
                                return base.ConvertFrom (context, culture, value);
 
+                       // FIXME: use culture
                        string [] subs = s.Split (',');
                        if (subs.Length != 2)
                                throw new ArgumentException ("Failed to parse Text(" + s + ") expected text in the format \"x, y.\"");
@@ -64,9 +90,19 @@ namespace System.Drawing
                                                  object value,
                                                  Type destinationType)
                {
+                       // LAMESPEC: "The default implementation calls the object's
+                       // ToString method if the object is valid and if the destination
+                       // type is string." MS does not behave as per the specs.
+                       // Oh well, we have to be compatible with MS.
                        if ((destinationType == typeof (string)) && (value is Point))
                                return ((Point) value).X + ", " + ((Point) value).Y;
                        
+                       if (destinationType == typeof (InstanceDescriptor) && value is Point) {
+                               Point c = (Point)value;
+                               ConstructorInfo ctor = typeof(Point).GetConstructor (new Type[] {typeof(int), typeof(int)} );
+                               return new InstanceDescriptor (ctor, new object[] {c.X, c.Y });
+                       }
+
                        return base.ConvertTo (context, culture, value, destinationType);
                }
 
@@ -85,12 +121,14 @@ namespace System.Drawing
                        return true;
                }
 
-               [MonoTODO]
                public override PropertyDescriptorCollection GetProperties (
                                                        ITypeDescriptorContext context,
                                                        object value, Attribute[] attributes)
                {
-                       throw new NotImplementedException ();
+                       if (value is Point)
+                               return TypeDescriptor.GetProperties (value, attributes);
+
+                       return base.GetProperties (context, value, attributes);
                }
                
                public override bool GetPropertiesSupported (ITypeDescriptorContext context)