Author: toshok
Date: 2006-10-30 22:51:37 -0500 (Mon, 30 Oct 2006)
New Revision: 67171

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
Log:
        * Control.cs: ugh, the unit test fix (CH11, yesterday) breaks when
        recreating forms.  Control recreation is the bane of my existence.
        Fix it in a way that keeps everyone happy.

2006-10-30  Chris Toshok  <[EMAIL PROTECTED]>



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-10-31 02:17:59 UTC (rev 67170)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-10-31 03:51:37 UTC (rev 67171)
@@ -1,5 +1,11 @@
 2006-10-30  Chris Toshok  <[EMAIL PROTECTED]>
 
+       * Control.cs: ugh, the unit test fix (CH11, yesterday) breaks when
+       recreating forms.  Control recreation is the bane of my existence.
+       Fix it in a way that keeps everyone happy.
+
+2006-10-30  Chris Toshok  <[EMAIL PROTECTED]>
+
        * XplatUIX11.cs: use StructureNotifyMask on all whole_windows, not
        just non-CHILD ones.  otherwise sometimes scrollbars end up with
        client_windows not being resized to the proper size (ReportBuilder

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2006-10-31 02:17:59 UTC (rev 67170)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2006-10-31 03:51:37 UTC (rev 67171)
@@ -3351,7 +3351,8 @@
 
                                children = child_controls.GetAllControls ();
                                for (int i = 0; i < children.Length; i++ ) {
-                                       XplatUI.SetParent(children[i].Handle, 
window.Handle); 
+                                       if (!children[i].RecreatingHandle)
+                                               
XplatUI.SetParent(children[i].Handle, window.Handle); 
                                }
 
                                UpdateStyles();

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

Reply via email to