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

	* XamlType.cs : sort of reverted AllowedContentTypes.
	  msdn explanation is so wrong.

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

diff --git a/mcs/class/System.Xaml/System.Xaml/ChangeLog b/mcs/class/System.Xaml/System.Xaml/ChangeLog
index 7a698f02080b88c59e96f4bb4ca4e24f266bc591..822a01daef53890e5de6c8b0ca1aa2d8ae4bffb6 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/ChangeLog
+++ b/mcs/class/System.Xaml/System.Xaml/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-16  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XamlType.cs : sort of reverted AllowedContentTypes.
+         msdn explanation is so wrong.
+
 2010-04-16  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XamlSchemaContext.cs : implement GetXamlDirective().

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlType.cs b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
index d79672e7c11b4e73fb56d638d5bc27dc29c9dccd..8a851e178fe3e714699334f792e91874f8412885 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/XamlType.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
@@ -376,6 +376,10 @@ namespace System.Xaml
 
                protected virtual IList<XamlType> LookupAllowedContentTypes ()
                {
+                       // the actual implementation is very different from what is documented :(
+                       return null;
+
+                       /*
                        var l = new List<XamlType> ();
                        if (ContentWrappers != null)
                                l.AddRange (ContentWrappers);
@@ -384,6 +388,7 @@ namespace System.Xaml
                        if (ItemType != null)
                                l.Add (ItemType);
                        return l.Count > 0 ? l : null;
+                       */
                }
 
                protected virtual XamlMember LookupAttachableMember (string name)