diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-27 12:36:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-27 12:36:56 (GMT) |
| commit | b83ed80002d8d8eb676c9f7c81a794e8216e3498 (patch) | |
| tree | c60953cf292d7784e416ed6fd0555d89d2e6f2c3 /generic/tkCmds.c | |
| parent | fb81bb7d6255f5040661d59559edf32bc997bd6d (diff) | |
| download | tk-b83ed80002d8d8eb676c9f7c81a794e8216e3498.zip tk-b83ed80002d8d8eb676c9f7c81a794e8216e3498.tar.gz tk-b83ed80002d8d8eb676c9f7c81a794e8216e3498.tar.bz2 | |
Eliminate all Tcl_GetIndexFromObj calls, which is only a thin wrapper around Tcl_GetIndexFromObjStruct.
Diffstat (limited to 'generic/tkCmds.c')
| -rw-r--r-- | generic/tkCmds.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c index 4933d34..f7fa27c 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -760,8 +760,8 @@ CaretCmd( * Return the current value of the selected option */ - if (Tcl_GetIndexFromObj(interp, objv[2], caretStrings, - "caret option", 0, &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[2], caretStrings, + sizeof(char *), "caret option", 0, &index) != TCL_OK) { return TCL_ERROR; } if (index == TK_CARET_X) { @@ -776,8 +776,8 @@ CaretCmd( int i, value, x = 0, y = 0, height = -1; for (i = 2; i < objc; i += 2) { - if ((Tcl_GetIndexFromObj(interp, objv[i], caretStrings, - "caret option", 0, &index) != TCL_OK) || + if ((Tcl_GetIndexFromObjStruct(interp, objv[i], caretStrings, + sizeof(char *), "caret option", 0, &index) != TCL_OK) || Tcl_GetIntFromObj(interp,objv[i+1],&value) != TCL_OK) { return TCL_ERROR; } @@ -1011,8 +1011,8 @@ Tk_TkwaitObjCmd( return TCL_ERROR; } - if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, - &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[1], optionStrings, + sizeof(char *), "option", 0, &index) != TCL_OK) { return TCL_ERROR; } @@ -1192,8 +1192,8 @@ Tk_UpdateObjCmd( if (objc == 1) { flags = TCL_DONT_WAIT; } else if (objc == 2) { - if (Tcl_GetIndexFromObj(interp, objv[1], updateOptions, "option", 0, - &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[1], updateOptions, + sizeof(char *), "option", 0, &index) != TCL_OK) { return TCL_ERROR; } flags = TCL_IDLE_EVENTS; @@ -1339,8 +1339,8 @@ Tk_WinfoObjCmd( Tcl_WrongNumArgs(interp, 1, objv, "option ?arg?"); return TCL_ERROR; } - if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, - &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[1], optionStrings, + sizeof(char *), "option", 0, &index) != TCL_OK) { return TCL_ERROR; } @@ -1863,8 +1863,8 @@ Tk_WmObjCmd( Tcl_WrongNumArgs(interp, 1, objv, "option window ?arg?"); return TCL_ERROR; } - if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0, - &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[1], optionStrings, + sizeof(char *), "option", 0, &index) != TCL_OK) { return TCL_ERROR; } |