2010-04-22 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / System.Xaml / System.Xaml / XamlObjectReader.cs

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlObjectReader.cs b/mcs/class/System.Xaml/System.Xaml/XamlObjectReader.cs
index 080018b7a55331d2abd2cc8b47557329947de373..59f87d22a0e2c70f50a2f653f9bc2f90efd5c0ed 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/XamlObjectReader.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlObjectReader.cs
@@ -274,8 +274,10 @@ namespace System.Xaml
                        var ns = xt.PreferredXamlNamespace;
                        if (!l.Contains (ns))
                                l.Add (ns);
-                       foreach (var xm in xt.GetAllMembers ()) {
+                       foreach (var xm in xt.GetAllReadWriteMembers ()) {
                                ns = xm.PreferredXamlNamespace;
+                               if (xm is XamlDirective && ns == XamlLanguage.Xaml2006Namespace)
+                                       continue;
                                if (xm.Type.IsCollection || xm.Type.IsDictionary || xm.Type.IsArray)
                                        continue; // FIXME: process them too.
                                CollectNamespaces (l, xm.Invoker.GetValue (o), xm.Type);
@@ -312,9 +314,10 @@ namespace System.Xaml
 
                        var xm = members_stack.Peek ().Current;
                        var obj = objects.Peek ();
+                       var xt = types.Peek ();
                        if (xm == XamlLanguage.Initialization)
-                               return types.Peek ().GetStringValue (obj);
-                       return xm != null ? xm.GetMemberValue (obj) : instance;
+                               return xt.GetStringValue (obj);
+                       return xm != null ? xm.GetMemberValue (xt, obj) : instance;
                }
        }
 }