* SchemaTypes.cs: Changed DataSet type for a more generic XmlSerializable.

[mono.git] / mcs / class / System.Web / System.Web.UI / ControlBuilder.cs

diff --git a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
index 5532f5716efcd3d384a9cbeb88f03031a3b22d80..df99f33f0cbdcb798a30fb837b26fc31337358f2 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
@@ -25,7 +25,7 @@ namespace System.Web.UI {
                                                           BindingFlags.IgnoreCase;
 
                TemplateParser parser;
-               ControlBuilder parentBuilder;
+               internal ControlBuilder parentBuilder;
                Type type;             
                string tagName;
                string id;
@@ -112,7 +112,7 @@ namespace System.Web.UI {
 
                                Type ptype = parentBuilder.ControlType;
                                if (ptype == null)
-                                       return typeof (Control);
+                                       return parentBuilder.NamingContainerType;
 
                                if (!typeof (INamingContainer).IsAssignableFrom (ptype))
                                        return parentBuilder.NamingContainerType;
@@ -175,6 +175,7 @@ namespace System.Web.UI {
                {
                        subBuilder.OnAppendToParentBuilder (this);
                        
+                       subBuilder.parentBuilder = this;
                        if (childrenAsProperties) {
                                AppendToProperty (subBuilder);
                                return;