From ad8ed27f51643ddc0638128ee823ef30afc05fc8 Mon Sep 17 00:00:00 2001
From: brianlagunas_cp <XceedBoucherS@users.noreply.github.com>
Date: Mon, 24 Oct 2011 15:11:13 +0000
Subject: [PATCH] PropertyGrid: fixed issue where an ExpandableObject would
 only show properties of a base class or interface.

---
 .../PropertyGrid/Implementation/PropertyItem.cs              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
index 23d3da7f..1d814a2c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
@@ -385,12 +385,15 @@ namespace Microsoft.Windows.Controls.PropertyGrid
 
         private void GetChildProperties()
         {
-            PropertyDescriptorCollection descriptors = PropertyDescriptor.GetChildProperties();
+            if (Value == null)
+                return;
 
             var propertyItems = new List<PropertyItem>();
 
             try
             {
+                PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors(Value);
+
                 foreach (PropertyDescriptor descriptor in descriptors)
                 {
                     if (descriptor.IsBrowsable)