X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI%2FUserControlControlBuilder.cs;h=3053fa48e8ad265c539d31a8f54e653caa9ed21e;hb=879970ea20a49e63a5413adec014754b30a53e03;hp=ae1c8b9d068f6d32ca4ccf91be4556b62e342edb;hpb=538d3bb80572334c18ae117ea7703406a4a22872;p=mono.git diff --git a/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs index ae1c8b9d068..3053fa48e8a 100644 --- a/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs +++ b/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs @@ -5,7 +5,7 @@ // Gonzalo Paniagua Javier (gonzalo@ximian.com) // // (C) 2003 Ximian, Inc (http://www.ximian.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 @@ -29,8 +29,8 @@ using System.Security.Permissions; -namespace System.Web.UI { - +namespace System.Web.UI +{ // CAS [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)] [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)] @@ -41,17 +41,15 @@ namespace System.Web.UI { return false; } - [MonoTODO] + [MonoTODO ("Not implemented, does nothing")] public override void SetTagInnerText (string text) { // Do something with the text } -#if NET_2_0 - [MonoTODO ("why override?")] + public override object BuildObject () { return base.BuildObject (); } -#endif } }