diff options
author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-06-05 12:52:35 (GMT) |
---|---|---|
committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2013-06-05 12:52:35 (GMT) |
commit | c15faf509f653bddf20c1cdd26ab6e7be4a4dc84 (patch) | |
tree | 5e87988c18034af615cafd0cbed34d53573f704d /generic/tkEntry.c | |
parent | af55a52369b34edd1f5879005be3b54d7518b34e (diff) | |
download | tk-c15faf509f653bddf20c1cdd26ab6e7be4a4dc84.zip tk-c15faf509f653bddf20c1cdd26ab6e7be4a4dc84.tar.gz tk-c15faf509f653bddf20c1cdd26ab6e7be4a4dc84.tar.bz2 |
Fix [2100430]: ttk::entry widget index must be integer
Diffstat (limited to 'generic/tkEntry.c')
-rw-r--r-- | generic/tkEntry.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 26311a3..816b7fa 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -2519,12 +2519,6 @@ GetEntryIndex( } else { badIndex: - /* - * Some of the paths here leave messages in the interp's result, - * so we have to clear it out before storing our own message. - */ - - Tcl_SetResult(interp, NULL, TCL_STATIC); Tcl_AppendResult(interp, "bad ", (entryPtr->type == TK_ENTRY) ? "entry" : "spinbox", " index \"", string, "\"", NULL); @@ -2544,7 +2538,6 @@ GetEntryIndex( } } else if (string[0] == 's') { if (entryPtr->selectFirst < 0) { - Tcl_SetResult(interp, NULL, TCL_STATIC); Tcl_AppendResult(interp, "selection isn't in widget ", Tk_PathName(entryPtr->tkwin), NULL); return TCL_ERROR; @@ -2562,7 +2555,7 @@ GetEntryIndex( } else if (string[0] == '@') { int x, roundUp, maxWidth; - if (Tcl_GetInt(interp, string + 1, &x) != TCL_OK) { + if (Tcl_GetInt(NULL, string + 1, &x) != TCL_OK) { goto badIndex; } if (x < entryPtr->inset) { @@ -2589,7 +2582,7 @@ GetEntryIndex( *indexPtr += 1; } } else { - if (Tcl_GetInt(interp, string, indexPtr) != TCL_OK) { + if (Tcl_GetInt(NULL, string, indexPtr) != TCL_OK) { goto badIndex; } if (*indexPtr < 0){ |