[asp.net] Fix for bug #685267. ClientScriptManager generates correct post-back event...

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

diff --git a/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/UserControlControlBuilder.cs
index 3b28e011287a8aaf2a02ab1998543ef2b1fcfb9b..3053fa48e8ad265c539d31a8f54e653caa9ed21e 100644 (file)
--- 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)]
@@ -46,11 +46,10 @@ namespace System.Web.UI {
                {
                        // Do something with the text
                }
-#if NET_2_0
+
                public override object BuildObject ()
                {
                        return base.BuildObject ();
                }
-#endif
        }
 }