Merge pull request #2916 from ludovic-henry/fix-40306

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolder.cs
index 0b665b9fd2af459083f17a69b2131323298e5cbb..5dc6cc60fa47f9e965b477de3c11a9b5707bdff4 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolder.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ContentPlaceHolder.cs
@@ -4,7 +4,7 @@
 // Authors:
 //   Lluis Sanchez Gual (lluis@novell.com)
 //
-// (C) 2005 Novell, Inc.
+// (C) 2005-2010 Novell, Inc.
 //
 
 //
@@ -28,8 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System;
 using System.Collections;
 using System.ComponentModel;
@@ -38,12 +36,12 @@ namespace System.Web.UI.WebControls
 {
        [ToolboxItemFilterAttribute ("Microsoft.VisualStudio.Web.WebForms.MasterPageWebFormDesigner", ToolboxItemFilterType.Require)]
        [ToolboxItemFilterAttribute ("System.Web.UI", ToolboxItemFilterType.Allow)]
-       [DesignerAttribute ("System.Web.UI.Design.WebControls.ContentPlaceHolderDesigner, System.Design, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.ComponentModel.Design.IDesigner")]
-       [ToolboxDataAttribute ("<{0}:ContentPlaceHolder runat='server'></{0}:ContentPlaceHolder>")]
+       [DesignerAttribute ("System.Web.UI.Design.WebControls.ContentPlaceHolderDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
+                               
+       [ToolboxDataAttribute ("<;{0}:ContentPlaceHolder runat=&quot;server&quot;></{0}:ContentPlaceHolder>")]
        [ControlBuilder(typeof(ContentPlaceHolderBuilder))] 
-       public class ContentPlaceHolder: Control, INamingContainer
+       public class ContentPlaceHolder: Control, INamingContainer, INonBindingContainer
        {
        }
 }
 
-#endif