Author: jackson
Date: 2006-06-30 02:36:40 -0400 (Fri, 30 Jun 2006)
New Revision: 62150
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs
Log:
* InternalWindowManager.cs: Remove some debug code.
* Form.cs: When an MdiParent is set to null, the window is
"detatched" and becomes a normal window.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-06-30 01:14:40 UTC (rev 62149)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-06-30 06:36:40 UTC (rev 62150)
@@ -1,3 +1,9 @@
+2006-06-30 Jackson Harper <[EMAIL PROTECTED]>
+
+ * InternalWindowManager.cs: Remove some debug code.
+ * Form.cs: When an MdiParent is set to null, the window is
+ "detatched" and becomes a normal window.
+
2006-06-29 Peter Dennis Bartok <[EMAIL PROTECTED]>
* PrintDialog.cs: Labels need a tab index too, otherwise they overlap
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2006-06-30 01:14:40 UTC (rev 62149)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2006-06-30 06:36:40 UTC (rev 62150)
@@ -519,26 +519,29 @@
}
set {
- SuspendLayout ();
-
- // TopLevel = true;
-
- if (!value.IsMdiContainer)
+ if (value != null && !value.IsMdiContainer)
throw new ArgumentException ();
if (mdi_parent != null) {
mdi_parent.MdiContainer.Controls.Remove
(this);
}
- mdi_parent = value;
- if (mdi_parent != null) {
+ if (value != null) {
+ mdi_parent = value;
window_manager = new MdiWindowManager
(this,
mdi_parent.MdiContainer);
mdi_parent.MdiContainer.Controls.Add
(this);
+
UpdateStyles ();
+ } else if (mdi_parent != null) {
+ mdi_parent = null;
+
+ // Create a new window manager
+ window_manager = null;
+ FormBorderStyle = form_border_style;
+
+ RecreateHandle ();
}
-
- ResumeLayout ();
}
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs
2006-06-30 01:14:40 UTC (rev 62149)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs
2006-06-30 06:36:40 UTC (rev 62150)
@@ -415,7 +415,6 @@
protected virtual void HandleTitleBarDown (int x, int y)
{
foreach (TitleButton button in title_buttons) {
- Console.WriteLine ("BUTTON RECTANGLE: {0}",
button.Rectangle);
if (button != null && button.Rectangle.Contains
(x, y)) {
button.State = ButtonState.Pushed;
return;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
