2008-06-27 Ivan N. Zlatev <contact@i-nz.net>

	* Control.cs: Visibility of the control should be false
	when the handle is destroyed in WmDestroy and not immediately
	in Dispose(). This is effectively where the disposing process
	ends even though the control is marked as Disposed immediately
	after calling Dispose().
	[Fixes bug #402446]

svn path=/trunk/mcs/; revision=106721

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index cc491502b92c9ef15560e32b0b4c53bc7c83ac4c..b5879a18f055c54687d72b13e4ca2a12066b5ee6 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-27  Ivan N. Zlatev  <contact@i-nz.net>
+
+       * Control.cs: Visibility of the control should be false 
+       when the handle is destroyed in WmDestroy and not immediately 
+       in Dispose().
+       [Fixes bug #402446]
+
 2008-06-27  Ivan N. Zlatev  <contact@i-nz.net>
 
        * PropertyGridTextBox.cs: Start monitoring the mouse clicks 

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
index 2f83edeb680690ff487cc85bef76bfc231b16bc0..5ca80165f3197f76983f6a8329cded7a9486941a 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
@@ -1148,8 +1148,6 @@ namespace System.Windows.Forms
                                }
                        }
                        is_disposed = true;
-                       is_disposing = false;
-                       is_visible = false;
                        base.Dispose(disposing);
                }
                #endregion      // Public Constructors
@@ -5454,6 +5452,11 @@ namespace System.Windows.Forms
 #endif
                                is_recreating = false;
                        }
+
+                       if (is_disposing) {
+                               is_disposing = false;
+                               is_visible = false;
+                       }
                }
 
                private void WmWindowPosChanged (ref Message m) {