Author: pbartok
Date: 2006-05-18 19:22:50 -0400 (Thu, 18 May 2006)
New Revision: 60851
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
Log:
2006-05-18 Peter Dennis Bartok <[EMAIL PROTECTED]>
* Control.cs: Brought back our old UpdateZOrder method as a private
function and switched our calls from UpdateZOrder to the new one.
This fixes the Paint.Net canvas disappearing bug.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-05-18 23:17:00 UTC (rev 60850)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-05-18 23:22:50 UTC (rev 60851)
@@ -1,3 +1,9 @@
+2006-05-18 Peter Dennis Bartok <[EMAIL PROTECTED]>
+
+ * Control.cs: Brought back our old UpdateZOrder method as a private
+ function and switched our calls from UpdateZOrder to the new one.
+ This fixes the Paint.Net canvas disappearing bug.
+
2006-05-18 Peter Dennis Bartok <[EMAIL PROTECTED]>
* XplatUIX11.cs (DefWndProc): WM_SETCURSOR: Assign the return value
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-05-18 23:17:00 UTC (rev 60850)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2006-05-18 23:22:50 UTC (rev 60851)
@@ -337,7 +337,7 @@
value.InitLayout();
- owner.UpdateZOrder();
+ owner.UpdateChildrenZOrder();
owner.PerformLayout(value, "Parent");
owner.OnControlAdded(new
ControlEventArgs(value));
}
@@ -357,7 +357,7 @@
control.ChangeParent (owner);
control.InitLayout ();
- owner.UpdateZOrder ();
+ owner.UpdateChildrenZOrder ();
owner.PerformLayout (control, "Parent");
owner.OnControlAdded (new ControlEventArgs
(control));
}
@@ -514,7 +514,7 @@
value.ChangeParent(null);
- owner.UpdateZOrder();
+ owner.UpdateChildrenZOrder();
}
internal virtual void RemoveImplicit (Control control)
@@ -526,7 +526,7 @@
impl_list.Remove (control);
}
control.ChangeParent (null);
- owner.UpdateZOrder ();
+ owner.UpdateChildrenZOrder ();
}
public void RemoveAt(int index) {
@@ -2660,7 +2660,7 @@
controls [i].CreateControl ();
}
- UpdateZOrder();
+ UpdateChildrenZOrder();
if (binding_context == null) { // seem to be sent
whenever it's null?
OnBindingContextChanged(EventArgs.Empty);
@@ -3778,6 +3778,19 @@
}
}
+ private void UpdateChildrenZOrder() {
+ Control [] controls;
+
+ if (!IsHandleCreated) {
+ return;
+ }
+
+ controls = child_controls.GetAllControls ();
+ for (int i = 1; i < controls.Length; i++ ) {
+ XplatUI.SetZOrder(controls[i].Handle,
controls[i-1].Handle, false, false);
+ }
+ }
+
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected void UpdateZOrder() {
if (parent != null) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches