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

	* ToolStrip.cs: Set AutoSizeMode back to GrowAndShrink to refix
	bug #325406, but set a minimum for StatusStrip to 22 to keep
	bug #325390 fixed.  I think this minimum would have been figured
	up automatically if the grip was actually a ToolStripItem, but it
	currently is not.

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

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog

@@ -1,3 +1,11 @@
+2007-09-18  Jonathan Pobst  <monkey@jpobst.com>
+
+	* ToolStrip.cs: Set AutoSizeMode back to GrowAndShrink to refix
+	bug #325406, but set a minimum for StatusStrip to 22 to keep
+	bug #325390 fixed.  I think this minimum would have been figured
+	up automatically if the grip was actually a ToolStripItem, but it
+	currently is not.
+
 2007-09-18  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
 	* ListView.cs: max_label_wrapping is now 30 pixels instead of 38,

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs

@@ -98,6 +98,7 @@ public ToolStrip (params ToolStripItem[] items) : base ()
 			this.items = new ToolStripItemCollection (this, items, true);
 			this.allow_merge = true;
 			base.AutoSize = true;
+			this.SetAutoSizeMode (AutoSizeMode.GrowAndShrink);
 			this.back_color = Control.DefaultBackColor;
 			this.can_overflow = true;
 			base.CausesValidation = false;
@@ -1431,6 +1432,9 @@ internal virtual Size GetToolStripPreferredSize (Size proposedSize)
 				if (new_size.Height == 0)
 					new_size.Height = ExplicitBounds.Height;
 
+				if (this is StatusStrip)
+					new_size.Height = Math.Max (new_size.Height, 22);
+
 				return new_size;
 			}
 		}