summaryrefslogtreecommitdiffstats
path: root/generic/tkPack.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-24 22:23:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-24 22:23:54 (GMT)
commit8e4cfc592771290d75f559ef2dea0836cc26e7fe (patch)
tree1fb2875276fc5cbc1467e2eb88932f8d4a1ff96f /generic/tkPack.c
parente0b0e0d820827f64af467e09ae1556ac755d9f11 (diff)
downloadtk-8e4cfc592771290d75f559ef2dea0836cc26e7fe.zip
tk-8e4cfc592771290d75f559ef2dea0836cc26e7fe.tar.gz
tk-8e4cfc592771290d75f559ef2dea0836cc26e7fe.tar.bz2
more places converted
Diffstat (limited to 'generic/tkPack.c')
-rw-r--r--generic/tkPack.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 134b61f..928e793 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -88,7 +88,7 @@ typedef struct Packer {
* Tk will set its requested size to fit the
* needs of its slaves.
* ALLOCED_MASTER 1 means that Pack has allocated itself as
- * geometry master for this window.
+ * geometry master for this window.
*/
#define REQUESTED_REPACK 1
@@ -217,8 +217,8 @@ Tk_PackObjCmd(
return TCL_ERROR;
}
- if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
- &index) != TCL_OK) {
+ if (Tcl_GetIndexFromObjStruct(interp, objv[1], optionStrings,
+ sizeof(char *), "option", 0, &index) != TCL_OK) {
/*
* Call it again without the deprecated ones to get a proper error
* message. This works well since there can't be any ambiguity between
@@ -226,8 +226,8 @@ Tk_PackObjCmd(
*/
Tcl_ResetResult(interp);
- Tcl_GetIndexFromObj(interp, objv[1], &optionStrings[4], "option", 0,
- &index);
+ Tcl_GetIndexFromObjStruct(interp, objv[1], &optionStrings[4],
+ sizeof(char *), "option", 0, &index);
return TCL_ERROR;
}
@@ -409,7 +409,7 @@ Tk_PackObjCmd(
if (masterPtr->slavePtr != NULL) {
if (TkSetGeometryMaster(interp, master, "pack") != TCL_OK) {
- return TCL_ERROR;
+ return TCL_ERROR;
}
masterPtr->flags |= ALLOCED_MASTER;
}
@@ -1287,7 +1287,7 @@ PackAfter(
!= TCL_OK) {
Tk_ManageGeometry(tkwin, NULL, NULL);
Unlink(packPtr);
- return TCL_ERROR;
+ return TCL_ERROR;
}
masterPtr->flags |= ALLOCED_MASTER;
}
@@ -1593,8 +1593,8 @@ ConfigureSlaves(
Tcl_SetErrorCode(interp, "TK", "PACK", "BAD_PARAMETER", NULL);
return TCL_ERROR;
}
- if (Tcl_GetIndexFromObj(interp, objv[i], optionStrings, "option",
- 0, &index) != TCL_OK) {
+ if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings,
+ sizeof(char *), "option", 0, &index) != TCL_OK) {
return TCL_ERROR;
}
@@ -1725,8 +1725,8 @@ ConfigureSlaves(
}
break;
case CONF_SIDE:
- if (Tcl_GetIndexFromObj(interp, objv[i+1], sideNames, "side",
- TCL_EXACT, &side) != TCL_OK) {
+ if (Tcl_GetIndexFromObjStruct(interp, objv[i+1], sideNames,
+ sizeof(char *), "side", TCL_EXACT, &side) != TCL_OK) {
return TCL_ERROR;
}
slavePtr->side = (Side) side;
@@ -1829,7 +1829,7 @@ ConfigureSlaves(
!= TCL_OK) {
Tk_ManageGeometry(slave, NULL, NULL);
Unlink(slavePtr);
- return TCL_ERROR;
+ return TCL_ERROR;
}
masterPtr->flags |= ALLOCED_MASTER;
}