Author: jpobst
Date: 2007-10-18 14:26:24 -0400 (Thu, 18 Oct 2007)
New Revision: 87783
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
Log:
2007-10-17 Jonathan Pobst <[EMAIL PROTECTED]>
* ErrorProvider.cs: Add the error provider's internal window to a
containercontrol when the parent changes. [Fixes bug #329714]
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-10-18 18:16:10 UTC (rev 87782)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-10-18 18:26:24 UTC (rev 87783)
@@ -1,3 +1,8 @@
+2007-10-17 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * ErrorProvider.cs: Add the error provider's internal window to a
+ containercontrol when the parent changes. [Fixes bug #329714]
+
2007-10-17 Geoff Norton <[EMAIL PROTECTED]>
* XplatUIOSX.cs: Implement ScrollWindow. Properly create TOOLWINDOWs.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
2007-10-18 18:16:10 UTC (rev 87782)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
2007-10-18 18:26:24 UTC (rev 87783)
@@ -255,10 +255,13 @@
private void control_ParentChanged (object sender,
EventArgs e)
{
- if (ep.container != null)
- return;
- control.Parent.Controls.Add (window);
- control.Parent.Controls.SetChildIndex (window,
0);
+ if (ep.container != null) {
+ ep.container.Controls.Add (window);
+ ep.container.Controls.SetChildIndex
(window, 0);
+ } else {
+ control.Parent.Controls.Add (window);
+ control.Parent.Controls.SetChildIndex
(window, 0);
+ }
}
private void window_Tick(object sender, EventArgs e) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
