* Control.cs: Don't try to set the border style on the window if

it hasn't been created. When the window is created the border style will be used. svn path=/trunk/mcs/; revision=50429
baulig · Sep 21, 2005 · e567046 · e567046
1 parent f0944a5
commit e567046
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-21  Jackson Harper  <jackson@ximian.com>
+
+	* Control.cs: Don't try to set the border style on the window if
+	it hasn't been created. When the window is created the border
+	style will be used.
+
 2005-09-21  Peter Dennis Bartok  <pbartok@novell.com>
 
 	* Control.cs (Update): Don't call XplatUI if we don't have a

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
@@ -628,7 +628,9 @@ internal BorderStyle InternalBorderStyle {
 				if (border_style != value) {
 					border_style = value;
 
-					XplatUI.SetBorderStyle(window.Handle, border_style);
+					if (IsHandleCreated)
+						XplatUI.SetBorderStyle(window.Handle,
+								border_style);
 				}
 			}
 		}