2004-04-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* TypeDescriptor.cs: fixed ComponentInfo.GetAttributes(). Now it returns
	all the attributes, not just DesignerAttribute instances. nGallery
	complained.

svn path=/trunk/mcs/; revision=25919

diff --git a/mcs/class/System/System.ComponentModel/ChangeLog b/mcs/class/System/System.ComponentModel/ChangeLog
index 38272f617997e3e0185c70238310154132345d04..2a2ae853d9c8b7b3c5b6131b5014edfa69853301 100644 (file)
--- a/mcs/class/System/System.ComponentModel/ChangeLog
+++ b/mcs/class/System/System.ComponentModel/ChangeLog
@@ -1,15 +1,21 @@
+2004-04-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * TypeDescriptor.cs: fixed ComponentInfo.GetAttributes(). Now it returns
+       all the attributes, not just DesignerAttribute instances. nGallery
+       complained.
+
 2004-04-21  Lluis Sanchez Gual <lluis@ximian.com>
 
-       * BooleanConverter.cs: GetStandardValues must return an array of booleans,
-         not an array of strings.
+       * BooleanConverter.cs: GetStandardValues must return an array of
+       booleans, not an array of strings.
 
 2004-04-16  Lluis Sanchez Gual <lluis@ximian.com>
 
-       * ReflectionPropertyDescriptor.cs: Access internal PropertyInfo through
-       GetPropertyInfo(). Take into account that a component may not be sited or
-       not have some services.
-       * TypeDescriptor.cs: GetTypeFromName():  Added null check for Site property.
-       Other minor fixes.
+       * ReflectionPropertyDescriptor.cs: Access internal PropertyInfo
+       through GetPropertyInfo(). Take into account that a component may not
+       be sited or not have some services.
+       * TypeDescriptor.cs: GetTypeFromName():  Added null check for Site
+       property.  Other minor fixes.
 
 2004-04-16     Joerg Rosenkranz <joergr@voelcker.com>
 

diff --git a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
index bc3507df5a69d840f9912ad077b00121efefc712..c598690fcf1668a0a332d0c3566e753ebdad9d45 100644 (file)
--- a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
+++ b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
@@ -570,7 +570,7 @@ public sealed class TypeDescriptor
                        if (_attributes != null) return _attributes;
                        
                        bool cache = true;
-                       object[] ats = _component.GetType().GetCustomAttributes (typeof(DesignerAttribute), true);
+                       object[] ats = _component.GetType().GetCustomAttributes (true);
                        Hashtable t = new Hashtable ();
                        foreach (Attribute at in ats)
                                t [at.TypeId] = at;