summaryrefslogtreecommitdiffstats
path: root/generic/tkGrid.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/tkGrid.c
parente0b0e0d820827f64af467e09ae1556ac755d9f11 (diff)
downloadtk-8e4cfc592771290d75f559ef2dea0836cc26e7fe.zip
tk-8e4cfc592771290d75f559ef2dea0836cc26e7fe.tar.gz
tk-8e4cfc592771290d75f559ef2dea0836cc26e7fe.tar.bz2
more places converted
Diffstat (limited to 'generic/tkGrid.c')
-rw-r--r--generic/tkGrid.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 19e4442..f8e18fd 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -242,7 +242,7 @@ typedef struct UniformGroup {
* Tk will set its requested size to fit the
* needs of its slaves.
* ALLOCED_MASTER 1 means that Grid has allocated itself as
- * geometry master for this window.
+ * geometry master for this window.
*/
#define REQUESTED_RELAYOUT 1
@@ -361,8 +361,8 @@ Tk_GridObjCmd(
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) {
return TCL_ERROR;
}
@@ -910,7 +910,7 @@ GridPropagateCommand(
if (masterPtr->slavePtr != NULL) {
if (TkSetGeometryMaster(interp, master, "grid") != TCL_OK) {
- return TCL_ERROR;
+ return TCL_ERROR;
}
masterPtr->flags |= ALLOCED_MASTER;
}
@@ -1076,8 +1076,8 @@ GridRowColumnConfigureCommand(
* returned.
*/
- if (Tcl_GetIndexFromObj(interp, objv[4], optionStrings, "option", 0,
- &index) != TCL_OK) {
+ if (Tcl_GetIndexFromObjStruct(interp, objv[4], optionStrings,
+ sizeof(char *), "option", 0, &index) != TCL_OK) {
Tcl_DecrRefCount(listCopy);
return TCL_ERROR;
}
@@ -1175,8 +1175,8 @@ GridRowColumnConfigureCommand(
*/
for (i = 4; i < objc; i += 2) {
- 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) {
Tcl_DecrRefCount(listCopy);
return TCL_ERROR;
}
@@ -1364,8 +1364,8 @@ GridSlavesCommand(
}
for (i = 3; i < objc; i += 2) {
- 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;
}
if (Tcl_GetIntFromObj(interp, objv[i+1], &value) != TCL_OK) {
@@ -3058,8 +3058,8 @@ ConfigureSlaves(
*/
for (i = numWindows; i < objc; i += 2) {
- 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;
}
if (index == CONF_IN) {
@@ -3161,8 +3161,8 @@ ConfigureSlaves(
*/
for (i = numWindows; i < objc; i += 2) {
- Tcl_GetIndexFromObj(interp, objv[i], optionStrings, "option", 0,
- &index);
+ Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings,
+ sizeof(char *), "option", 0, &index);
switch ((enum options) index) {
case CONF_COLUMN:
if (Tcl_GetIntFromObj(NULL, objv[i+1], &tmp) != TCL_OK