2007-09-18 Jonathan Pobst <monkey@jpobst.com>

* ToolStripControlHostTest.cs: DefaultSize is based off hosted control, but when the base constructor sets this, the control is null. Set it again in the constructor. Fixes a failing monobuild test. svn path=/trunk/mcs/; revision=85988
baulig · Sep 18, 2007 · 431628f · 431628f
1 parent b760210
commit 431628f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
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 @@
+2007-09-18  Jonathan Pobst  <monkey@jpobst.com>
+
+	* ToolStripControlHostTest.cs: DefaultSize is based off hosted control,
+	but when the base constructor sets this, the control is null.  Set it
+	again in the constructor.  Fixes a failing monobuild test.
+
 2007-09-18  Jonathan Pobst  <monkey@jpobst.com>
 
 	* ToolStripDropDownItem.cs: Make sure Click and DropDownOpened events

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripControlHost.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripControlHost.cs
@@ -47,6 +47,7 @@ public ToolStripControlHost (Control c) : base ()
 			this.control = c;
 			this.control_align = ContentAlignment.MiddleCenter;
 			this.control.TabStop = false;
+			this.Size = DefaultSize;
 			this.OnSubscribeControlEvents (this.control);
 		}