X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI.HtmlControls%2FHtmlInputReset.cs;h=9c9314daadacb6e0ac51f90da54b00bd25fc6468;hb=df9c98dda18083ec63171490267e08342621ef45;hp=ee566d56e936d98a7065161f8ee408f742e53e52;hpb=b585d00928892398dfbfc315ed78b8032fa14708;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputReset.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputReset.cs
index ee566d56e93..9c9314daada 100644
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputReset.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputReset.cs
@@ -4,7 +4,7 @@
 // Author:
 //	Chris Toshok  <toshok@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
@@ -26,13 +26,11 @@
 // 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.HtmlControls {
-
+namespace System.Web.UI.HtmlControls
+{
 	// CAS
 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
@@ -41,7 +39,7 @@ namespace System.Web.UI.HtmlControls {
 	[SupportsEventValidation]
 	public class HtmlInputReset : HtmlInputButton
 	{
-		private static readonly object ServerClickEvent = new object();
+		static readonly object ServerClickEvent = new object();
 
 		public HtmlInputReset ()
 			: base ("reset")
@@ -66,7 +64,7 @@ namespace System.Web.UI.HtmlControls {
 
 		[Browsable (false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public new string ValidationGroup
+		public override string ValidationGroup
 		{
 			get {
 				return ViewState.GetString ("ValidationGroup", "");
@@ -85,4 +83,4 @@ namespace System.Web.UI.HtmlControls {
 
 	}
 }
-#endif
+