Prechádzať zdrojové kódy

2007-05-08 Igor Zelmanovich <[email protected]>

	* RunWorkerCompletedEventArgs.cs: added 'new' keyword, cause 
	UserState hides inherit property.


svn path=/trunk/mcs/; revision=76919
Igor Zelmanovich 18 rokov pred
rodič
commit
f27dcc17d5

+ 5 - 0
mcs/class/System/System.ComponentModel/ChangeLog

@@ -1,3 +1,8 @@
+2007-05-08 Igor Zelmanovich <[email protected]>
+
+	* RunWorkerCompletedEventArgs.cs: added 'new' keyword, cause 
+	UserState hides inherit property.
+
 2007-04-07  Gert Driesen  <[email protected]>
 
 	* RecommendedAsConfigurableAttribute.cs: Mark obsolete on 2.0 profile.

+ 1 - 1
mcs/class/System/System.ComponentModel/RunWorkerCompletedEventArgs.cs

@@ -52,7 +52,7 @@ namespace System.ComponentModel
 		// It is always null. See .ctor() for details.
 		[Browsable (false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public object UserState {
+		public new object UserState {
 			get { return user_state; }
 		}
 	}