Author: jpobst
Date: 2007-01-05 13:13:04 -0500 (Fri, 05 Jan 2007)
New Revision: 70546

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
Log:
2007-01-05  Jonathan Pobst  <[EMAIL PROTECTED]>

        * Control.cs: Move LayoutEngine.Layout to the OnLayout method, so
        that inheritors can not call it if they choose.  Fixes bug #80456.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-05 18:09:11 UTC (rev 70545)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-05 18:13:04 UTC (rev 70546)
@@ -1,3 +1,8 @@
+2007-01-05  Jonathan Pobst  <[EMAIL PROTECTED]>
+
+       * Control.cs: Move LayoutEngine.Layout to the OnLayout method, so
+       that inheritors can not call it if they choose.  Fixes bug #80456.
+
 2007-01-05  Andreia Gaita  <[EMAIL PROTECTED]>
 
        * XplatUIWin32.cs: Initialize MSG.refobject at 0 so it 

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2007-01-05 18:09:11 UTC (rev 70545)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2007-01-05 18:13:04 UTC (rev 70546)
@@ -3339,9 +3339,6 @@
 
                        // Perform all Dock and Anchor calculations
                        try {
-                               layout_engine.Layout(this, levent);
-
-                               // Let everyone know
                                OnLayout(levent);
                        }
 
@@ -4929,6 +4926,8 @@
                        LayoutEventHandler eh = (LayoutEventHandler)(Events 
[LayoutEvent]);
                        if (eh != null)
                                eh (this, levent);
+
+                       layout_engine.Layout (this, levent);
                }
 
                [EditorBrowsable(EditorBrowsableState.Advanced)]

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

Reply via email to