summaryrefslogtreecommitdiffstats
path: root/generic/ttk/ttkNotebook.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-24 14:00:22 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-24 14:00:22 (GMT)
commite0b0e0d820827f64af467e09ae1556ac755d9f11 (patch)
tree00c1f2568bb436b660acd8ed3b863b86b96cf086 /generic/ttk/ttkNotebook.c
parent2ab1424bf6fff3a16b3b76dc5321491e2ccfcd79 (diff)
parent7a60939a9fb681c46c9a5db933814ee54e88ba54 (diff)
downloadtk-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/ttkNotebook.c')
-rw-r--r--generic/ttk/ttkNotebook.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 6849135..16a8bfe 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -1058,9 +1058,8 @@ static int NotebookIdentifyCommand(
if ( Tcl_GetIntFromObj(interp, objv[objc-2], &x) != TCL_OK
|| Tcl_GetIntFromObj(interp, objv[objc-1], &y) != TCL_OK
- || (objc == 5 &&
- Tcl_GetIndexFromObj(interp, objv[2], whatTable, "option", 0, &what)
- != TCL_OK)
+ || (objc == 5 && Tcl_GetIndexFromObjStruct(interp, objv[2], whatTable,
+ sizeof(char *), "option", 0, &what) != TCL_OK)
) {
return TCL_ERROR;
}