Author: andreia
Date: 2007-05-04 14:13:13 -0400 (Fri, 04 May 2007)
New Revision: 76714
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
Log:
* ContainerControl.cs: Fix active_control attribution when going
up the parent chain so that the first parent container gets the control
and the rest of the parent containers get the child containers (skips
non-containers). Fixes #80729
2007-05-04 Andreia Gaita <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-05-04 16:06:20 UTC (rev 76713)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-05-04 18:13:13 UTC (rev 76714)
@@ -1,3 +1,10 @@
+2007-05-04 Andreia Gaita <[EMAIL PROTECTED]>
+
+ * ContainerControl.cs: Fix active_control attribution when going
+ up the parent chain so that the first parent container gets the control
+ and the rest of the parent containers get the child containers (skips
+ non-containers). Fixes #80729
+
2007-05-04 Randolph Chung <[EMAIL PROTECTED]>
* FileDialog.cs: Implement the SupportMultiDottedExtensions property.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
2007-05-04 16:06:20 UTC (rev 76713)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
2007-05-04 18:13:13 UTC (rev 76714)
@@ -154,9 +154,12 @@
}
walk = this;
+ Control ctl = this;
while (walk != null) {
- if (walk.Parent is
ContainerControl)
-
((ContainerControl)walk.Parent).active_control = walk;
+ if (walk.Parent is
ContainerControl) {
+ ((ContainerControl)
walk.Parent).active_control = ctl;
+ ctl = walk.Parent;
+ }
walk = walk.Parent;
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches