* UI/ParseChildrenAttribute.cs: fixed ChildControlType property to compliant to .net

* UI/UserControl.cs: fixed ParseChildren attribute to be compliant to .net
* WebControls/Content.cs:
* WebControls/Label.cs:
* WebControls/ListControl.cs:
* WebControls/MultiView.cs:
* WebControls/WebControl.cs: fixed ParseChildren attribute to be compliant to .net
* HtmlControls/HtmlTable.cs:
* HtmlControls/HtmlTableRow.cs: fixed ParseChildren attribute to be compliant to .net


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

mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog

@@ -1,3 +1,9 @@
+2006-08-08  Vladimir Krasnov  <[email protected]>
+
+	* HtmlTable.cs:
+	* HtmlTableRow.cs: fixed ParseChildren attribute to be compliant
+	to .net
+
 2006-07-12 Andrew Skiba <[email protected]>
 
 	* HtmlInputControl.cs: remove obsolete #if NET_2_0

mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs

@@ -36,11 +36,7 @@ namespace System.Web.UI.HtmlControls {
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	// attributes
-#if NET_2_0
-	[ParseChildren (true, "Rows", ChildControlType = typeof(Control))]
-#else
-	[ParseChildren (true, "Rows")]
-#endif		
+	[ParseChildren (true, "Rows")]	
 	public class HtmlTable : HtmlContainerControl {
 
 		private HtmlTableRowCollection _rows;

mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs

@@ -35,11 +35,7 @@ namespace System.Web.UI.HtmlControls {
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	// attributes
-#if NET_2_0
-	[ParseChildren (true, "Cells", ChildControlType = typeof(Control))]
-#else	
-	[ParseChildren (true, "Cells")]
-#endif		
+	[ParseChildren (true, "Cells")]	
 	public class HtmlTableRow : HtmlContainerControl {
 
 		private HtmlTableCellCollection _cells;

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,12 @@
+2006-08-08 Vladimir Krasnov <[email protected]>
+
+	* Content.cs:
+	* Label.cs:
+	* ListControl.cs:
+	* MultiView.cs:
+	* WebControl.cs: fixed ParseChildren attribute to be compliant
+	to .net
+
 2006-08-03 Vladimir Krasnov <[email protected]>
 
 	* MultiView.cs: fixed: EnableTheming property

mcs/class/System.Web/System.Web.UI.WebControls/Content.cs

@@ -37,7 +37,9 @@ namespace System.Web.UI.WebControls
 {
 	[ToolboxItem (false)]
 	[DesignerAttribute ("System.Web.UI.Design.WebControls.ContentDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
+#if !TARGET_JVM
 	[ControlBuilder(typeof(ContentBuilderInternal))]
+#endif
 	public class Content: Control, INamingContainer
 	{
 		[ThemeableAttribute (false)]

mcs/class/System.Web/System.Web.UI.WebControls/Label.cs

@@ -42,13 +42,12 @@ namespace System.Web.UI.WebControls {
 	[DataBindingHandler("System.Web.UI.Design.TextDataBindingHandler, " + Consts.AssemblySystem_Design)]
 	[DefaultProperty("Text")]
 	[Designer("System.Web.UI.Design.WebControls.LabelDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
+	[ParseChildren (false)]
 #if NET_2_0
 	[ToolboxData("<{0}:Label runat=\"server\" Text=\"Label\"></{0}:Label>")]
-	[ParseChildren(false, ChildControlType = typeof(Control))]
 	[ControlValueProperty ("Text", null)]
 #else	
 	[ToolboxData("<{0}:Label runat=server>Label</{0}:Label>")]
-	[ParseChildren(false)]
 #endif		
 	public class Label : WebControl
 #if NET_2_0

mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs

@@ -42,11 +42,9 @@ namespace System.Web.UI.WebControls {
 	[DefaultPropertyAttribute ("DataSource")]
 #endif
 	[Designer("System.Web.UI.Design.WebControls.ListControlDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
+	[ParseChildrenAttribute (true, "Items")]
 #if NET_2_0
 	[ControlValueProperty ("SelectedValue", null)]
-	[ParseChildrenAttribute (true, "Items", ChildControlType = typeof (Control))]
-#else
-	[ParseChildrenAttribute (true, "Items")]
 #endif	
 	public abstract class ListControl :
 #if NET_2_0

mcs/class/System.Web/System.Web.UI.WebControls/MultiView.cs

@@ -41,7 +41,11 @@ namespace System.Web.UI.WebControls
 //	[ControlBuilder (typeof(MultiViewControlBuilder)]
 	[Designer ("System.Web.UI.Design.WebControls.MultiViewDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
 	[ToolboxData ("<{0}:MultiView runat=\"server\"></{0}:MultiView>")]
-	[ParseChildren (false, ChildControlType = typeof(View))]
+#if NET_2_0
+	[ParseChildren (typeof(View))]
+#else
+	[ParseChildren (false)]
+#endif
 	[DefaultEvent ("ActiveViewChanged")]
 	public class MultiView: Control
 	{

mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs

@@ -34,13 +34,12 @@ namespace System.Web.UI.WebControls {
 	[AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	// attributes
+	[ParseChildren (true)]
 #if NET_2_0
 	[PersistChildrenAttribute (false, false)]
-	[ParseChildrenAttribute (true, ChildControlType = typeof(Control))]
 	[Themeable (true)]
 #else	
 	[PersistChildrenAttribute (false)]
-	[ParseChildrenAttribute (true)]
 #endif		
 	public class WebControl : Control, IAttributeAccessor {
 		Style style;

mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,3 +1,10 @@
+2006-08-06  Vladimir Krasnov  <[email protected]>
+
+	* ParseChildrenAttribute.cs: fixed ChildControlType property to
+	compliant to .net
+	* UserControl.cs: fixed ParseChildren attribute to be compliant
+	to .net
+
 2006-08-08 Igor Zelmanovich <[email protected]>
 
 	* Page.cs: implemented MaintainScrollPositionOnPostBack feature

mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs

@@ -93,7 +93,6 @@ namespace System.Web.UI {
 #if NET_2_0
 		public Type ChildControlType {
 			get { return childType; }
-			internal set { childType = value; }
 		}
 #endif
 

mcs/class/System.Web/System.Web.UI/UserControl.cs

@@ -45,12 +45,11 @@ namespace System.Web.UI {
 	[DefaultEvent ("Load"), DesignerCategory ("ASPXCodeBehind")]
 	[ToolboxItem (false)]
 	[Designer ("System.Web.UI.Design.UserControlDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
+	[ParseChildren (true)]
 #if NET_2_0
 	[Designer ("Microsoft.VisualStudio.Web.WebForms.WebFormDesigner, " + Consts.AssemblyMicrosoft_VisualStudio_Web, typeof (IRootDesigner))]
-	[ParseChildren (true, "", ChildControlType = typeof (Control))]
 #else
 	[RootDesignerSerializer ("Microsoft.VSDesigner.WebForms.RootCodeDomSerializer, " + Consts.AssemblyMicrosoft_VSDesigner, "System.ComponentModel.Design.Serialization.CodeDomSerializer, " + Consts.AssemblySystem_Design, true)]
-	[ParseChildren (true)]
 #endif
 	public class UserControl : TemplateControl, IAttributeAccessor, IUserControlDesignerAccessor
 #if NET_2_0