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

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

diff --git a/mcs/class/System/System.ComponentModel/TypeConverter.cs b/mcs/class/System/System.ComponentModel/TypeConverter.cs
index 2df285fa0fb41db318138ea38801556f8da23d7e..1abb70f4182221bb582dd2ddfac7133de4789a94 100755 (executable)
--- a/mcs/class/System/System.ComponentModel/TypeConverter.cs
+++ b/mcs/class/System/System.ComponentModel/TypeConverter.cs
@@ -9,6 +9,27 @@
 // (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;
 using System.Collections;
 using System.Globalization;
@@ -219,6 +240,12 @@ namespace System.ComponentModel
                        return true;
                }
 
+               protected PropertyDescriptorCollection SortProperties (PropertyDescriptorCollection props, string[] names)
+               {
+                       props.Sort (names);
+                       return props; 
+               }
+
                public class StandardValuesCollection : ICollection, IEnumerable
                {
                        private ICollection values;
@@ -267,7 +294,7 @@ namespace System.ComponentModel
                        public SimplePropertyDescriptor (Type componentType,
                                                         string name,
                                                         Type propertyType) :
-                               this (componentType, name, propertyType, new Attribute [0])
+                               this (componentType, name, propertyType, null)
                        {
                        }
 
@@ -291,6 +318,29 @@ namespace System.ComponentModel
                        public override bool IsReadOnly {
                                get { return Attributes.Contains (ReadOnlyAttribute.Yes); }
                        }
+
+                       public override bool ShouldSerializeValue (object component)
+                       {
+                                       return false; 
+                       }
+
+                       public override bool CanResetValue (object component)
+                       {
+                               DefaultValueAttribute Attrib = ((DefaultValueAttribute) Attributes[typeof (DefaultValueAttribute)]);
+                               if (Attrib == null) {
+                                       return false; 
+                               }
+                               return (Attrib.Value == GetValue (component)); 
+                       }
+
+                       public override void ResetValue (object component)
+                       {
+                               DefaultValueAttribute Attrib = ((DefaultValueAttribute) Attributes[typeof (DefaultValueAttribute)]);
+                               if (Attrib != null) {
+                                       SetValue (component, Attrib.Value); 
+                               }
+ 
+                       } 
                }
        }
 }