summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2011-06-07 21:06:06 (GMT)
committerdgp@users.sourceforge.net <dgp>2011-06-07 21:06:06 (GMT)
commitdeea84a944e6c17ebfd5101a164094c51247828f (patch)
treed5a774bdf752755cf7bdd4c82caa062ea0530e67
parent89bed74cd8e501ed16963abff9a42066687dacad (diff)
downloadtk-deea84a944e6c17ebfd5101a164094c51247828f.zip
tk-deea84a944e6c17ebfd5101a164094c51247828f.tar.gz
tk-deea84a944e6c17ebfd5101a164094c51247828f.tar.bz2
Bug 2358545: Restore support for values "08" and "09"in a [spinbox] configured
to use -from and -to values.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkEntry.c9
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 46d0a23..2c9c1ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-07 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tkEntry.c: Restore support for values "08" and "09"
+ in a [spinbox] configured to use -from and -to values. [Bug 2358545].
+
2011-06-06 Don Porter <dgp@users.sourceforge.net>
* generic/tkConsole.c: Restore proper NUL output to the [console].
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 3694375..f1c4816 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -1330,11 +1330,10 @@ ConfigureEntry(
* isn't a double value, we set it to -from.
*/
- int code;
double dvalue;
- code = Tcl_GetDouble(NULL, entryPtr->string, &dvalue);
- if (code != TCL_OK) {
+ if (sscanf(entryPtr->string, "%lf", &dvalue) == 0) {
+ /* Scan failure */
dvalue = sbPtr->fromValue;
} else {
if (dvalue > sbPtr->toValue) {
@@ -4241,9 +4240,9 @@ SpinboxInvoke(
} else if (!DOUBLES_EQ(sbPtr->fromValue, sbPtr->toValue)) {
double dvalue;
- if (Tcl_GetDouble(NULL, entryPtr->string, &dvalue) != TCL_OK) {
+ if (sscanf(entryPtr->string, "%lf", &dvalue) == 0) {
/*
- * If the string is empty, or isn't a valid double value, just
+ * If the string doesn't scan as a double value, just
* use the -from value
*/