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/ttkLayout.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/ttkLayout.c')
| -rw-r--r-- | generic/ttk/ttkLayout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c index de9d795..ba24589 100644 --- a/generic/ttk/ttkLayout.c +++ b/generic/ttk/ttkLayout.c @@ -636,8 +636,8 @@ Ttk_LayoutTemplate Ttk_ParseLayoutTemplate(Tcl_Interp *interp, Tcl_Obj *objPtr) if (optName[0] != '-') break; - if (Tcl_GetIndexFromObj( - interp, objv[i], optStrings, "option", 0, &option) + if (Tcl_GetIndexFromObjStruct(interp, objv[i], optStrings, + sizeof(char *), "option", 0, &option) != TCL_OK) { goto error; @@ -653,8 +653,8 @@ Ttk_LayoutTemplate Ttk_ParseLayoutTemplate(Tcl_Interp *interp, Tcl_Obj *objPtr) switch (option) { case OP_SIDE: /* <<NOTE-PACKSIDE>> */ - if (Tcl_GetIndexFromObj(interp, objv[i], packSideStrings, - "side", 0, &value) != TCL_OK) + if (Tcl_GetIndexFromObjStruct(interp, objv[i], packSideStrings, + sizeof(char *), "side", 0, &value) != TCL_OK) { goto error; } |