diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-24 14:00:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-24 14:00:22 (GMT) |
| commit | e0b0e0d820827f64af467e09ae1556ac755d9f11 (patch) | |
| tree | 00c1f2568bb436b660acd8ed3b863b86b96cf086 /generic/tkButton.c | |
| parent | 2ab1424bf6fff3a16b3b76dc5321491e2ccfcd79 (diff) | |
| parent | 7a60939a9fb681c46c9a5db933814ee54e88ba54 (diff) | |
| download | tk-e0b0e0d820827f64af467e09ae1556ac755d9f11.zip tk-e0b0e0d820827f64af467e09ae1556ac755d9f11.tar.gz tk-e0b0e0d820827f64af467e09ae1556ac755d9f11.tar.bz2 | |
Merge core-8-5-branch
Various Tcl_GetIndexFromObj -> Tcl_GetIndexFromObjStruct changes.
Diffstat (limited to 'generic/tkButton.c')
| -rw-r--r-- | generic/tkButton.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index 73e5d4c..94a904d 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -797,8 +797,8 @@ ButtonWidgetObjCmd( Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?"); return TCL_ERROR; } - result = Tcl_GetIndexFromObj(interp, objv[1], commandNames[butPtr->type], - "option", 0, &index); + result = Tcl_GetIndexFromObjStruct(interp, objv[1], commandNames[butPtr->type], + sizeof(char), "option", 0, &index); if (result != TCL_OK) { return result; } @@ -1643,7 +1643,7 @@ ButtonVarProc( } butPtr->flags |= SELECTED; butPtr->flags &= ~TRISTATED; - } else if (butPtr->offValuePtr + } else if (butPtr->offValuePtr && strcmp(value, Tcl_GetString(butPtr->offValuePtr)) == 0) { if (!(butPtr->flags & (SELECTED | TRISTATED))) { return NULL; |