浏览代码

* NumericUpDown.cs: In .NET 1.1, user entered text is still
hexadecimal in ParseUserEdit.

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

Gert Driesen 19 年之前
父节点
当前提交
a209b2fc85

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

@@ -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: 

+ 9 - 6
mcs/class/Managed.Windows.Forms/System.Windows.Forms/NumericUpDown.cs

@@ -337,12 +337,15 @@ namespace System.Windows.Forms {
 			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;