Merge pull request #4540 from kumpera/android-changes-part1

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CompositeControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CompositeControl.cs
index 2d006b14aef402e755ec392236d5e40742faed29..beeaf5365653a4b2301a934cd79a67f4f357e7ea 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CompositeControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CompositeControl.cs
@@ -4,7 +4,7 @@
 // Authors: Ben Maurer <bmaurer@novell.com>
 //          Chris Toshok <toshok@novell.com>
 //
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2005-2010 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -26,20 +26,21 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.ComponentModel;
 using System.Security.Permissions;
 
-namespace System.Web.UI.WebControls {
-
+namespace System.Web.UI.WebControls
+{
        // CAS
        [AspNetHostingPermissionAttribute (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        [AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        // attributes
        [Designer ("System.Web.UI.Design.WebControls.CompositeControlDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
-       public abstract class CompositeControl : WebControl, INamingContainer, ICompositeControlDesignerAccessor {
-
+       public abstract class CompositeControl : WebControl, INamingContainer, ICompositeControlDesignerAccessor
+       {
+               public override bool SupportsDisabledAttribute {
+                       get { return RenderingCompatibilityLessThan40; }
+               }
                protected CompositeControl ()
                {
                }
@@ -52,12 +53,12 @@ namespace System.Web.UI.WebControls {
                        base.DataBind();
                }
 
-               protected internal override void Render (HtmlTextWriter w)
+               protected internal override void Render (HtmlTextWriter writer)
                {
                        /* make sure all the child controls have been created */
                        EnsureChildControls ();
                        /* and then... */
-                       base.Render (w);
+                       base.Render (writer);
                }
 
                void ICompositeControlDesignerAccessor.RecreateChildControls ()
@@ -84,4 +85,3 @@ namespace System.Web.UI.WebControls {
        }
 }
 
-#endif