Author: toshok
Date: 2006-11-03 15:34:52 -0500 (Fri, 03 Nov 2006)
New Revision: 67326

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
Log:
2006-11-03  Chris Toshok  <[EMAIL PROTECTED]>

        * Control.cs (Dispose): only go through the dispose thing if we're
        @disposing, and we haven't already been disposed.  Fixes bug
        #79814.

        * Form.cs: no reason to call "base.Dispose()" here instead of
        "Dispose()".



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-11-03 20:22:19 UTC (rev 67325)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-11-03 20:34:52 UTC (rev 67326)
@@ -1,3 +1,12 @@
+2006-11-03  Chris Toshok  <[EMAIL PROTECTED]>
+
+       * Control.cs (Dispose): only go through the dispose thing if we're
+       @disposing, and we haven't already been disposed.  Fixes bug
+       #79814.
+
+       * Form.cs: no reason to call "base.Dispose()" here instead of
+       "Dispose()".
+
 2006-11-03  Mike Kestner  <[EMAIL PROTECTED]>
 
        * ComboBox.cs : use ToString instead of casts in AddItem for

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2006-11-03 20:22:19 UTC (rev 67325)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2006-11-03 20:34:52 UTC (rev 67326)
@@ -774,7 +774,7 @@
                private delegate void RemoveDelegate(object c);
 
                protected override void Dispose(bool disposing) {
-                       if (disposing) {
+                       if (!is_disposed && disposing) {
                                Capture = false;
 
                                if (dc_mem!=null) {

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2006-11-03 20:22:19 UTC (rev 67325)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2006-11-03 20:34:52 UTC (rev 67326)
@@ -1769,7 +1769,7 @@
                                                OnClosing (args);
                                                if (!args.Cancel) {
                                                        OnClosed 
(EventArgs.Empty);
-                                                       base.Dispose();
+                                                       Dispose ();
                                                }
                                                return;
                                        } else {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to