Merge pull request #876 from knocte/master

[mono.git] / mcs / class / System / System.ComponentModel / DoWorkEventArgs.cs

diff --git a/mcs/class/System/System.ComponentModel/DoWorkEventArgs.cs b/mcs/class/System/System.ComponentModel/DoWorkEventArgs.cs
index 84ac6c3b4e36cb4735a085d1a578022ee169e09a..0f72b95be51485984f36773859d8afb7a751a0f0 100644 (file)
--- a/mcs/class/System/System.ComponentModel/DoWorkEventArgs.cs
+++ b/mcs/class/System/System.ComponentModel/DoWorkEventArgs.cs
@@ -28,11 +28,14 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 namespace System.ComponentModel
 {
-       public class DoWorkEventArgs : CancelEventArgs
+       public class DoWorkEventArgs
+#if !NET_2_1
+               : CancelEventArgs
+#else
+               : EventArgs
+#endif
        {
                public DoWorkEventArgs (object argument)
                {
@@ -49,7 +52,14 @@ namespace System.ComponentModel
                        get { return result; }
                        set { result = value; }
                }
-       }
-}
 
+#if NET_2_1
+               bool cancel;
+
+               public bool Cancel {
+                       get { return cancel; }
+                       set { cancel = value; }
+               }
 #endif
+       }
+}