summaryrefslogtreecommitdiffstats
path: root/generic/tkListbox.c
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2013-02-27 14:41:41 (GMT)
committerjenglish <jenglish@flightlab.com>2013-02-27 14:41:41 (GMT)
commit2b76c49e30421aa22968c63e57c49bfaa6238e2f (patch)
treee4c799bd7715375437a5ca9333297d2092c73630 /generic/tkListbox.c
parentb83ed80002d8d8eb676c9f7c81a794e8216e3498 (diff)
downloadtk-2b76c49e30421aa22968c63e57c49bfaa6238e2f.zip
tk-2b76c49e30421aa22968c63e57c49bfaa6238e2f.tar.gz
tk-2b76c49e30421aa22968c63e57c49bfaa6238e2f.tar.bz2
Revert [ac229dabaa]. There is a reason the Tcl_GetIndexFromObj wrapper
exists and is used.
Diffstat (limited to 'generic/tkListbox.c')
-rw-r--r--generic/tkListbox.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index 77a2d34..c5460f9 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -615,8 +615,8 @@ ListboxWidgetObjCmd(
* valid subcommand names
*/
- result = Tcl_GetIndexFromObjStruct(interp, objv[1], commandNames,
- sizeof(char *), "option", 0, &cmdIndex);
+ result = Tcl_GetIndexFromObj(interp, objv[1], commandNames,
+ "option", 0, &cmdIndex);
if (result != TCL_OK) {
return result;
}
@@ -969,8 +969,8 @@ ListboxWidgetObjCmd(
break;
}
- result = Tcl_GetIndexFromObjStruct(interp, objv[2], scanCommandNames,
- sizeof(char *), "option", 0, &scanCmdIndex);
+ result = Tcl_GetIndexFromObj(interp, objv[2], scanCommandNames,
+ "option", 0, &scanCmdIndex);
if (result != TCL_OK) {
break;
}
@@ -1164,8 +1164,8 @@ ListboxSelectionSubCmd(
return result;
}
}
- result = Tcl_GetIndexFromObjStruct(interp, objv[2], selCommandNames,
- sizeof(char *), "option", 0, &selCmdIndex);
+ result = Tcl_GetIndexFromObj(interp, objv[2], selCommandNames,
+ "option", 0, &selCmdIndex);
if (result != TCL_OK) {
return result;
}
@@ -2709,8 +2709,7 @@ GetListboxIndex(
* First see if the index is one of the named indices.
*/
- result = Tcl_GetIndexFromObjStruct(NULL, indexObj, indexNames,
- sizeof(char *), "", 0, &index);
+ result = Tcl_GetIndexFromObj(NULL, indexObj, indexNames, "", 0, &index);
if (result == TCL_OK) {
switch (index) {
case INDEX_ACTIVE: