diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-11 08:49:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-11 08:49:10 (GMT) |
| commit | 93c2250b76cfde6cbc1f1401ce8ddbd3a2897399 (patch) | |
| tree | 7eaf719658cc851ca8f0e2903fd64fad1d4f6948 /generic/tkImgPhoto.c | |
| parent | 0cbbe5eeb5a312da166ebe21b7800fb47353621b (diff) | |
| download | tk-93c2250b76cfde6cbc1f1401ce8ddbd3a2897399.zip tk-93c2250b76cfde6cbc1f1401ce8ddbd3a2897399.tar.gz tk-93c2250b76cfde6cbc1f1401ce8ddbd3a2897399.tar.bz2 | |
After TIP #481 reaches Tcl9.0, TkGetStringFromObj() becomes obsolete. This commit shows how.
Diffstat (limited to 'generic/tkImgPhoto.c')
| -rw-r--r-- | generic/tkImgPhoto.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index e7b367e..82c715d 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -457,7 +457,7 @@ ImgPhotoCmd( Tcl_WrongNumArgs(interp, 2, objv, "option"); return TCL_ERROR; } - arg = TkGetStringFromObj(objv[2], &length); + arg = Tcl_GetStringFromObj(objv[2], &length); if (strncmp(arg,"-data", length) == 0) { if (modelPtr->dataString) { Tcl_SetObjResult(interp, modelPtr->dataString); @@ -506,7 +506,7 @@ ImgPhotoCmd( return TCL_OK; } else if (objc == 3) { - const char *arg = TkGetStringFromObj(objv[2], &length); + const char *arg = Tcl_GetStringFromObj(objv[2], &length); if (length > 1 && !strncmp(arg, "-data", length)) { Tcl_AppendResult(interp, "-data {} {} {}", NULL); @@ -1503,7 +1503,7 @@ ParseSubcommandOptions( * optPtr->name. */ - expandedOption = option = TkGetStringFromObj(objv[index], &length); + expandedOption = option = Tcl_GetStringFromObj(objv[index], &length); if (option[0] != '-') { if (optPtr->name == NULL) { optPtr->name = objv[index]; @@ -1781,7 +1781,7 @@ ImgPhotoConfigureModel( args = (const char **)ckalloc((objc + 1) * sizeof(char *)); for (i = 0, j = 0; i < objc; i++,j++) { - args[j] = TkGetStringFromObj(objv[i], &length); + args[j] = Tcl_GetStringFromObj(objv[i], &length); if ((length > 1) && (args[j][0] == '-')) { if ((args[j][1] == 'd') && !strncmp(args[j], "-data", length)) { @@ -1862,7 +1862,7 @@ ImgPhotoConfigureModel( */ TkSizeT bytesize; - (void) TkGetByteArrayFromObj(data, &bytesize); + (void) Tcl_GetByteArrayFromObj(data, &bytesize); if (bytesize) { Tcl_IncrRefCount(data); } else { |