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 | b744234ad43b7dc3544f0184e2b76d9f28137551 (patch) | |
| tree | 00c1f2568bb436b660acd8ed3b863b86b96cf086 /win/tkWinDialog.c | |
| parent | c8bf7eaf6e7d5dbcf3c5ee48102077d9579e1de2 (diff) | |
| parent | bbbc32416a291c8abda4072bafa9579418034907 (diff) | |
| download | tk-b744234ad43b7dc3544f0184e2b76d9f28137551.zip tk-b744234ad43b7dc3544f0184e2b76d9f28137551.tar.gz tk-b744234ad43b7dc3544f0184e2b76d9f28137551.tar.bz2 | |
Merge core-8-5-branch
Various Tcl_GetIndexFromObj -> Tcl_GetIndexFromObjStruct changes.
Diffstat (limited to 'win/tkWinDialog.c')
| -rw-r--r-- | win/tkWinDialog.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index e22f520..069247e 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -356,8 +356,8 @@ Tk_ChooseColorObjCmd( optionPtr = objv[i]; valuePtr = objv[i + 1]; - if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option", - TCL_EXACT, &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, optionPtr, optionStrings, + sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) { return TCL_ERROR; } if (i + 1 == objc) { @@ -1382,8 +1382,8 @@ Tk_ChooseDirectoryObjCmd( optionPtr = objv[i]; valuePtr = objv[i + 1]; - if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option", 0, - &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, optionPtr, optionStrings, + sizeof(char *), "option", 0, &index) != TCL_OK) { goto cleanup; } if (i + 1 == objc) { @@ -1773,8 +1773,8 @@ Tk_MessageBoxObjCmd( optionPtr = objv[i]; valuePtr = objv[i + 1]; - if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option", - TCL_EXACT, &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, optionPtr, optionStrings, + sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) { return TCL_ERROR; } if (i + 1 == objc) { @@ -2260,8 +2260,8 @@ FontchooserConfigureCmd( for (i = 1; i < objc; i += 2) { int optionIndex, len; - if (Tcl_GetIndexFromObj(interp, objv[i], optionStrings, - "option", 0, &optionIndex) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings, + sizeof(char *), "option", 0, &optionIndex) != TCL_OK) { return TCL_ERROR; } if (objc == 2) { |