* Control.cs: Put the enum check back in now that MDI doesnt have

	to use this to set border styles.
	* Form.cs: Only set mdi child windows borders if the handle has
	been created.
	* MdiChildContext.cs: Don't set the InternalBorderStyle, just pass
	this directly on to the driver.

svn path=/trunk/mcs/; revision=53262

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index fae7a93ade33c2ebee4bdc3021421537c03ae3a0..c586b1aa7f5ab3c12e73b0e1acc4b37846e34348 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-18  Jackson Harper  <jackson@ximian.com>
+
+       * Control.cs: Put the enum check back in now that MDI doesnt have
+       to use this to set border styles.
+       * Form.cs: Only set mdi child windows borders if the handle has
+       been created.
+       * MdiChildContext.cs: Don't set the InternalBorderStyle, just pass
+       this directly on to the driver.
+
 2005-11-18  Jackson Harper  <jackson@ximian.com>
 
        * XplatUIX11.cs: Just compute the mdi borders separately as they

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
index a5415c8f973abdf9b65195adde2ce5820842fbed..f146b50b57875192a47c4f45b07d8eee381ff911 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
@@ -741,10 +741,8 @@ namespace System.Windows.Forms
                        }
 
                        set {
-                               /*
                                if (!Enum.IsDefined (typeof (BorderStyle), value))
                                        throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for BorderStyle", value));
-                               */
 
                                if (border_style != value) {
                                        border_style = value;

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
index 3f6ad8704d43a7848db109d99523ce306626f99f..6d0fa2fbba419524965d931a056a6234183b69a0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
@@ -331,7 +331,7 @@ namespace System.Windows.Forms {
                                        }
                                        UpdateStyles();
                                } else {
-                                       if (mdi_child_context != null)
+                                       if (mdi_child_context != null && IsHandleCreated)
                                                mdi_child_context.UpdateBorderStyle (value);
                                        UpdateStyles ();
                                }
@@ -800,8 +800,7 @@ namespace System.Windows.Forms {
                                        }
                                        
                                } else {
-                                       
-                               
+
                                        switch (FormBorderStyle) {
 
                                        case FormBorderStyle.Fixed3D: {

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiChildContext.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiChildContext.cs
index 399fdaf0ab8c81f81bb59af329096062bb70d08c..7cfe1dd0b808800b664033c0418d0dc48a1b2349 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiChildContext.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiChildContext.cs
@@ -62,11 +62,6 @@ namespace System.Windows.Forms {
                        this.form = form;
                        this.mdi_container = mdi_container;
 
-                       if (form.FormBorderStyle != FormBorderStyle.None)
-                               form.InternalBorderStyle = (BorderStyle) MdiBorderStyle;
-                       else
-                               form.InternalBorderStyle = BorderStyle.None;
-
                        /*
                        minimize_button = new Button ();
                        minimize_button.Bounds = new Rectangle (form.Width - 62,