Author: jpobst
Date: 2007-08-14 11:41:12 -0400 (Tue, 14 Aug 2007)
New Revision: 84086

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
Log:
2007-08-14  Jonathan Pobst  <[EMAIL PROTECTED]>

        * ToolBar.cs: Implement ScaleControl/ScaleCore.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-08-14 15:29:47 UTC (rev 84085)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-08-14 15:41:12 UTC (rev 84086)
@@ -1,3 +1,7 @@
+2007-08-14  Jonathan Pobst  <[EMAIL PROTECTED]>
+
+       * ToolBar.cs: Implement ScaleControl/ScaleCore.
+
 2007-08-13  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
 
        * PictureBox.cs: OnAnimateImage/UpdateAnimateImage: Check if handle is 
still

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs       
2007-08-14 15:29:47 UTC (rev 84085)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs       
2007-08-14 15:41:12 UTC (rev 84086)
@@ -567,6 +567,23 @@
                        LayoutToolBar ();
                }
 
+#if NET_2_0
+               protected override void ScaleControl (SizeF factor, 
BoundsSpecified specified)
+               {
+                       specified &= ~BoundsSpecified.Height;
+                       
+                       base.ScaleControl (factor, specified);
+               }
+
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               protected override void ScaleCore (float dx, float dy)
+               {
+                       dy = 1.0f;
+                       
+                       base.ScaleCore (dx, dy);
+               }
+#endif
+
                private int requested_size = -1;
 
                protected override void SetBoundsCore (int x, int y, int width, 
int height, BoundsSpecified specified)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to