diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-03-04 15:41:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-03-04 15:41:59 (GMT) |
| commit | 42e3af0d0ae489a65f7f3ce98429a394c0926c32 (patch) | |
| tree | 0149222f25fa8bd0c3a1cb50b3e71a5419cf6021 /generic/tkImage.c | |
| parent | 3fa224a2450a99a43c66f5f85951bcadb65430c2 (diff) | |
| parent | 2fd9fcf08d73f688888ef8784be0c5493b80d818 (diff) | |
| download | tk-42e3af0d0ae489a65f7f3ce98429a394c0926c32.zip tk-42e3af0d0ae489a65f7f3ce98429a394c0926c32.tar.gz tk-42e3af0d0ae489a65f7f3ce98429a394c0926c32.tar.bz2 | |
merge trunktip_415
Diffstat (limited to 'generic/tkImage.c')
| -rw-r--r-- | generic/tkImage.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tkImage.c b/generic/tkImage.c index ffa6f22..359d6c6 100644 --- a/generic/tkImage.c +++ b/generic/tkImage.c @@ -234,8 +234,8 @@ Tk_ImageObjCmd( return TCL_ERROR; } - if (Tcl_GetIndexFromObj(interp, objv[1], imageOptions, "option", 0, - &index) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[1], imageOptions, + sizeof(char *), "option", 0, &index) != TCL_OK) { return TCL_ERROR; } switch ((enum options) index) { @@ -283,13 +283,11 @@ Tk_ImageObjCmd( */ if ((objc == 3) || (*(arg = Tcl_GetString(objv[3])) == '-')) { - Tcl_CmdInfo dummy; - do { dispPtr->imageId++; sprintf(idString, "image%d", dispPtr->imageId); name = idString; - } while (Tcl_GetCommandInfo(interp, name, &dummy) != 0); + } while (Tcl_FindCommand(interp, name, NULL, 0) != NULL); firstOption = 3; } else { TkWindow *topWin; |