[Dotgnu-pnet-commits] CVS: pnetlib/System.Windows.Forms CancelEventArgs.cs, 1.1, 1.2 CancelEventHandler.cs, 1.2, 1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms
In directory subversions:/tmp/cvs-serv8330/System.Windows.Forms

Modified Files:
        CancelEventArgs.cs CancelEventHandler.cs 
Log Message:


Rewrite some "System.ComponentModel" classes and improve consistency.


Index: CancelEventArgs.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/CancelEventArgs.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CancelEventArgs.cs  17 Jun 2003 11:55:49 -0000      1.1
--- CancelEventArgs.cs  16 Sep 2003 22:00:18 -0000      1.2
***************
*** 1,11 ****
  /*
!  * CancelEventArgs.cs - Implementation of 
!  *                                            
"System.ComponentModel.CancelEventArgs" class
   *
!  * Copyright (C) 2002  Southern Storm Software, Pty Ltd.
!  * Copyright (C) 2002  Free Software Foundation, Inc.
   * 
-  * Contributed by Gopal.V
-  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
--- 1,8 ----
  /*
!  * CancelEventArgs.cs - Implementation of the
!  *                    "System.ComponentModel.CancelEventArgs" class.
   *
!  * Copyright (C) 2003  Southern Storm Software, Pty Ltd.
   * 
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
***************
*** 23,63 ****
   */
  
- using System;
- 
  namespace System.ComponentModel
  {
  
- // Replaces the missing "CancelEventArgs" class when no component model.
- 
  #if !CONFIG_COMPONENT_MODEL
  
!       public class CancelEventArgs: EventArgs
!       {
!       
!               private bool cancel;
!       
!               public CancelEventArgs()
!               {
!                       cancel = false;
!               }
! 
!               public CancelEventArgs(bool cancel)
!               {
!                       this.cancel = cancel;
!               }
!               
!               public bool Cancel 
!               {
!                       get
                        {
!                               return cancel;
                        }
!                       set
                        {
!                               cancel = value;
                        }
-               }
  
!       }
! #endif
! }//namespace
--- 20,59 ----
   */
  
  namespace System.ComponentModel
  {
  
  #if !CONFIG_COMPONENT_MODEL
  
! public class CancelEventArgs : EventArgs
! {
!       // Internal state.
!       private bool cancel;
! 
!       // Constructors.
!       public CancelEventArgs()
!                       {
!                               cancel = false;
!                       }
!       public CancelEventArgs(bool cancel)
                        {
!                               this.cancel = cancel;
                        }
!       
!       // Get or set the cancel state.
!       public bool Cancel 
                        {
!                               get
!                               {
!                                       return cancel;
!                               }
!                               set
!                               {
!                                       cancel = value;
!                               }
                        }
  
! }; // class CancelEventArgs
! 
! #endif // !CONFIG_COMPONENT_MODEL
! 
! }; // namespace System.ComponentModel

Index: CancelEventHandler.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/CancelEventHandler.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CancelEventHandler.cs       13 Aug 2003 01:21:41 -0000      1.2
--- CancelEventHandler.cs       16 Sep 2003 22:00:18 -0000      1.3
***************
*** 1,8 ****
  /*
!  * CancelEventHandler.cs - Implementation of 
!  *                                            
"System.ComponentModel.CancelEventHandler" class
   *
!  * Copyright (C) 2002  Southern Storm Software, Pty Ltd.
!  * Copyright (C) 2002  Free Software Foundation, Inc.
   *
   * This program is free software; you can redistribute it and/or modify
--- 1,7 ----
  /*
!  * CancelEventHandler.cs - Implementation of the
!  *                    "System.ComponentModel.CancelEventHandler" class.
   *
!  * Copyright (C) 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 21,35 ****
   */
  
- using System;
- 
  namespace System.ComponentModel
  {
  #if !CONFIG_COMPONENT_MODEL
  
- #if !ECMA_COMPAT
- [Serializable]
- #endif
  public delegate void CancelEventHandler(Object sender, CancelEventArgs e);
  
! #endif
! }//namespace
--- 20,31 ----
   */
  
  namespace System.ComponentModel
  {
+ 
  #if !CONFIG_COMPONENT_MODEL
  
  public delegate void CancelEventHandler(Object sender, CancelEventArgs e);
  
! #endif // !CONFIG_COMPONENT_MODEL
! 
! }; // namespace System.ComponentModel