2006-05-11 Jonathan Chambers <jonathan.chambers@ansys.com>

	* PropertyGrid.cs : Only check GetPropertiesSupported for properties,
	  not SelectedObject.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index e116a0920099d8f00e6f9b8d42f38de5b03ede69..cb54c7e0411f9eacf9fa2cbedef0375d1706d1f5 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11  Jonathan Chambers  <jonathan.chambers@ansys.com>
+
+       * PropertyGrid.cs : Only check GetPropertiesSupported for properties,
+         not SelectedObject.
+
 2006-05-11  Chris Toshok  <toshok@ximian.com>
 
        * Hwnd.cs (Invalid): don't start off with Rectangle.Empty, as

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
index 5a591a1117e7d233d4e1b28e14428265848786d0..de1688793581fec14a9214406bc8aa6c2ccec7ce 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
@@ -953,7 +953,7 @@ namespace System.Windows.Forms {
                }
 
                private void PopulateGridItemCollection (object obj, GridItemCollection grid_item_coll, bool recurse) {
-                       if (!TypeDescriptor.GetConverter(obj).GetPropertiesSupported())
+                       if (!recurse && !TypeDescriptor.GetConverter(obj).GetPropertiesSupported())
                                return;
                        PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(obj);
                        foreach (PropertyDescriptor property in properties) {