Author: everaldo
Date: 2006-11-30 09:56:45 -0500 (Thu, 30 Nov 2006)
New Revision: 68744
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
Log:
Fix an regression in ButtonSize
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-30 14:54:37 UTC (rev 68743)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-30 14:56:45 UTC (rev 68744)
@@ -1,3 +1,11 @@
+2006-11-30 Everaldo Canuto <[EMAIL PROTECTED]>
+
+ * ToolBar.cs:
+ - Fix an regression in ButtonSize.
+ - Get ImeMode default value change to "Disable".
+ - Get ShowTooltips default value change to true, default value is
+ "false" but after make a test in .NET we get "true" result as default.
+
2006-11-29 Jonathan Pobst <[EMAIL PROTECTED]>
* ToolStripDropDown.cs: Fix for SupportsTransparency change.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-11-30 14:54:37 UTC (rev 68743)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-11-30 14:56:45 UTC (rev 68744)
@@ -320,7 +320,7 @@
}
}
- ImeMode ime_mode;
+ ImeMode ime_mode = ImeMode.Disable;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
@@ -348,7 +348,8 @@
}
}
- bool show_tooltips = false;
+ // Default value is "false" but after make a test in .NET we
get "true" result as default.
+ bool show_tooltips = true;
[DefaultValue (false)]
[Localizable (true)]
@@ -876,9 +877,6 @@
bool Layout ()
{
- if (Parent == null)
- return false;
-
bool changed = false;
Theme theme = ThemeEngine.Current;
int x = theme.ToolBarGripWidth;
@@ -926,6 +924,10 @@
x += button.Rectangle.Width;
}
}
+
+ if (Parent == null)
+ return changed;
+
if (AutoSize)
Height = ht + (Wrappable ? y : 0);
else
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches