Bladeren bron

2006-12-31 Chris Toshok <[email protected]>

	* ToolBar.cs: don't assign to dock_style in the .ctor.  it doesn't
	override the layout style (anchor/dock) of the control.  assign to
	Dock instead.  Fixes bug #80416.

	* ToolStrip.cs: same.


svn path=/trunk/mcs/; revision=70297
Chris Toshok 19 jaren geleden
bovenliggende
commit
c0164b1d8b

+ 8 - 0
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog

@@ -1,3 +1,11 @@
+2006-12-31  Chris Toshok  <[email protected]>
+
+	* ToolBar.cs: don't assign to dock_style in the .ctor.  it doesn't
+	override the layout style (anchor/dock) of the control.  assign to
+	Dock instead.  Fixes bug #80416.
+
+	* ToolStrip.cs: same.
+
 2006-12-31  Andreia Gaita  <[email protected]>
 
 	* ContainerControl.cs: Use ContainerSelected flag to check if 

+ 1 - 1
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs

@@ -121,7 +121,7 @@ namespace System.Windows.Forms
 			background_color = ThemeEngine.Current.DefaultControlBackColor;
 			foreground_color = ThemeEngine.Current.DefaultControlForeColor;
 			buttons = new ToolBarButtonCollection (this);
-			dock_style = DockStyle.Top;
+			Dock = DockStyle.Top;
 			
 			GotFocus += new EventHandler (FocusChanged);
 			LostFocus += new EventHandler (FocusChanged);

+ 1 - 1
mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs

@@ -80,7 +80,7 @@ namespace System.Windows.Forms
 			base.AutoSize = true;
 			this.back_color = Control.DefaultBackColor;
 			base.CausesValidation = false;
-			this.dock_style = this.DefaultDock;
+			this.Dock = this.DefaultDock;
 			base.Font = new Font ("Tahoma", 8.25f);
 			this.fore_color = Control.DefaultForeColor;
 			this.grip_display_style = ToolStripGripDisplayStyle.Vertical;