diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-05 12:52:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-05 12:52:35 (GMT) |
| commit | d9a44369370d90d1b8dfd0decd866879a62715f6 (patch) | |
| tree | 09201a141bfa1354170c3de9a5580e894a6f4bee /generic | |
| parent | 4e1d1269673ab48c37c3da8f289e756f26f6a0e5 (diff) | |
| download | tk-d9a44369370d90d1b8dfd0decd866879a62715f6.zip tk-d9a44369370d90d1b8dfd0decd866879a62715f6.tar.gz tk-d9a44369370d90d1b8dfd0decd866879a62715f6.tar.bz2 | |
Fix [2100430]: ttk::entry widget index must be integer
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkEntry.c | 11 | ||||
| -rw-r--r-- | generic/ttk/ttkEntry.c | 8 | ||||
| -rw-r--r-- | generic/ttk/ttkScroll.c | 5 |
3 files changed, 11 insertions, 13 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){ diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 5c280e4..ae43ae6 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -1642,6 +1642,14 @@ static int EntryXViewCommand( void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Entry *entryPtr = recordPtr; + if (objc == 3) { + int newFirst; + if (EntryIndex(interp, entryPtr, objv[2], &newFirst) != TCL_OK) { + return TCL_ERROR; + } + TtkScrollTo(entryPtr->entry.xscrollHandle, newFirst); + return TCL_OK; + } return TtkScrollviewCommand(interp, objc, objv, entryPtr->entry.xscrollHandle); } diff --git a/generic/ttk/ttkScroll.c b/generic/ttk/ttkScroll.c index 5615eef..fc305e9 100644 --- a/generic/ttk/ttkScroll.c +++ b/generic/ttk/ttkScroll.c @@ -202,10 +202,7 @@ int TtkScrollviewCommand( Tcl_SetObjResult(interp, Tcl_NewListObj(2, result)); return TCL_OK; } else if (objc == 3) { - const char *string = Tcl_GetString(objv[2]); - if (strcmp(string, "end") == 0) { - newFirst = s->total; - } else if (Tcl_GetIntFromObj(interp, objv[2], &newFirst) != TCL_OK) { + if (Tcl_GetIntFromObj(interp, objv[2], &newFirst) != TCL_OK) { return TCL_ERROR; } } else { |