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/ttk/ttkImage.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/ttk/ttkImage.c')
-rw-r--r-- | generic/ttk/ttkImage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c index 1d455d9..a5a3a52 100644 --- a/generic/ttk/ttkImage.c +++ b/generic/ttk/ttkImage.c @@ -36,7 +36,7 @@ static void NullImageChanged(ClientData clientData, /* TtkGetImageSpec -- * Constructs a Ttk_ImageSpec * from a Tcl_Obj *. - * Result must be released using TtkFreeImageSpec. + * Result must be released using TtkFreeImageSpec. * * TODO: Need a variant of this that takes a user-specified ImageChanged proc */ @@ -364,8 +364,8 @@ Ttk_CreateImageElement( } #endif - if (Tcl_GetIndexFromObj(interp, objv[i], optionStrings, - "option", 0, &option) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings, + sizeof(char *), "option", 0, &option) != TCL_OK) { goto error; } |