New test.

[mono.git] / mcs / class / System / System.ComponentModel / DefaultValueAttribute.cs

diff --git a/mcs/class/System/System.ComponentModel/DefaultValueAttribute.cs b/mcs/class/System/System.ComponentModel/DefaultValueAttribute.cs
old mode 100755 (executable)
new mode 100644 (file)
index 970ac82..135c984
--- a/mcs/class/System/System.ComponentModel/DefaultValueAttribute.cs
+++ b/mcs/class/System/System.ComponentModel/DefaultValueAttribute.cs
@@ -7,6 +7,28 @@
 // (C) 2003 Andreas Nahr
 //
 
+//
+// 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.Globalization;
 namespace System.ComponentModel
 {
        [AttributeUsage(AttributeTargets.All)]
@@ -67,13 +89,10 @@ namespace System.ComponentModel
 
                public DefaultValueAttribute (Type type, string value)
                {
-                       // TODO check if this implementation is correct
                        try {
-                               DefaultValue = Convert.ChangeType (value, type);
-                       }
-                       catch {
-                               DefaultValue = null;
-                       }
+                               TypeConverter converter = TypeDescriptor.GetConverter (type);
+                               DefaultValue = converter.ConvertFromString (null, CultureInfo.InvariantCulture, value);
+                       } catch { }
                }
 
                public object Value {