Author: gert
Date: 2006-11-23 11:08:07 -0500 (Thu, 23 Nov 2006)
New Revision: 68401
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NumericUpDown.cs
Log:
* NumericUpDown.cs: In .NET 1.1, user entered text is still
hexadecimal in ParseUserEdit.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-23 16:04:51 UTC (rev 68400)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-23 16:08:07 UTC (rev 68401)
@@ -1,3 +1,8 @@
+2006-11-23 Gert Driesen <[EMAIL PROTECTED]>
+
+ * NumericUpDown.cs: In .NET 1.1, user entered text is still
+ hexadecimal in ParseUserEdit.
+
2006-11-23 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* MdiWindowManager.cs:
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NumericUpDown.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NumericUpDown.cs
2006-11-23 16:04:51 UTC (rev 68400)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/NumericUpDown.cs
2006-11-23 16:08:07 UTC (rev 68401)
@@ -337,12 +337,15 @@
try {
string user_edit_text = Text;
- if (!hexadecimal) {
- dvalue = decimal.Parse(user_edit_text,
CultureInfo.CurrentCulture);
- }
- else {
- dvalue = Convert.ToDecimal(Convert.ToInt32(user_edit_text,
10));
- }
+ if (!hexadecimal) {
+ dvalue = decimal.Parse(user_edit_text,
CultureInfo.CurrentCulture);
+ } else {
+#if NET_1_1
+ dvalue = Convert.ToDecimal
(Convert.ToInt32 (user_edit_text, 16));
+#else
+ dvalue = Convert.ToDecimal
(Convert.ToInt32 (user_edit_text, 10));
+#endif
+ }
if (dvalue < minimum) {
dvalue = minimum;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
