Merge core-8-5-branch

Various Tcl_GetIndexFromObj -> Tcl_GetIndexFromObjStruct changes.

33 files changed, 151 insertions, 151 deletions

diff --git a/generic/tk3d.c b/generic/tk3d.c
index dd7ab2f..7609f00 100644
--- a/generic/tk3d.c
+++ b/generic/tk3d.c
@@ -624,8 +624,8 @@ Tk_GetReliefFromObj(
 				 * from. */
     int *resultPtr)		/* Where to place the answer. */
 {
-    return Tcl_GetIndexFromObj(interp, objPtr, reliefStrings, "relief", 0,
-	    resultPtr);
+    return Tcl_GetIndexFromObjStruct(interp, objPtr, reliefStrings,
+	    sizeof(char), "relief", 0, resultPtr);
 }
 
 /*
diff --git a/generic/tkBusy.c b/generic/tkBusy.c
index 8f73d80..16c5128 100644
--- a/generic/tkBusy.c
+++ b/generic/tkBusy.c
@@ -816,8 +816,8 @@ Tk_BusyObjCmd(
 	return HoldBusy(busyTablePtr, interp, objv[1], objc-2, objv+2);
     }
 
-    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;
     }
     switch ((enum options) index) {
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 73e5d4c..94a904d 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -797,8 +797,8 @@ ButtonWidgetObjCmd(
         Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
 	return TCL_ERROR;
     }
-    result = Tcl_GetIndexFromObj(interp, objv[1], commandNames[butPtr->type],
-	    "option", 0, &index);
+    result = Tcl_GetIndexFromObjStruct(interp, objv[1], commandNames[butPtr->type],
+	    sizeof(char), "option", 0, &index);
     if (result != TCL_OK) {
 	return result;
     }
@@ -1643,7 +1643,7 @@ ButtonVarProc(
 	}
 	butPtr->flags |= SELECTED;
         butPtr->flags &= ~TRISTATED;
-    } else if (butPtr->offValuePtr 
+    } else if (butPtr->offValuePtr
 	&& strcmp(value, Tcl_GetString(butPtr->offValuePtr)) == 0) {
 	if (!(butPtr->flags & (SELECTED | TRISTATED))) {
 	    return NULL;
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index b3e76d2..e3a8401 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -737,8 +737,8 @@ DoObjConfig(
     case TK_OPTION_STRING_TABLE: {
 	int newValue;
 
-	if (Tcl_GetIndexFromObj(interp, valuePtr,
-		optionPtr->specPtr->clientData,
+	if (Tcl_GetIndexFromObjStruct(interp, valuePtr,
+		optionPtr->specPtr->clientData, sizeof(char),
 		optionPtr->specPtr->optionName+1, 0, &newValue) != TCL_OK) {
 	    return TCL_ERROR;
 	}
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 684c9aa..b78b6aa 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -697,8 +697,8 @@ ConsoleObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg?");
 	return TCL_ERROR;
     }
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, &index)
-	    != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], options,
+	    sizeof(char), "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -787,8 +787,8 @@ InterpreterObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "option arg");
 	return TCL_ERROR;
     }
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, &index)
-	    != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], options,
+	    sizeof(char), "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkFocus.c b/generic/tkFocus.c
index cfd2216..bdd953e 100644
--- a/generic/tkFocus.c
+++ b/generic/tkFocus.c
@@ -162,8 +162,8 @@ Tk_FocusObjCmd(
      * We have a subcommand to parse and act upon.
      */
 
-    if (Tcl_GetIndexFromObj(interp, objv[1], focusOptions, "option", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], focusOptions,
+	    sizeof(char), "option", 0, &index) != TCL_OK) {
     	return TCL_ERROR;
     }
     if (objc != 3) {
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index 8bc44ce..2e7081a 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -727,8 +727,8 @@ FrameWidgetObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
 	return TCL_ERROR;
     }
-    if (Tcl_GetIndexFromObj(interp, objv[1], frameOptions, "option", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], frameOptions,
+	    sizeof(char), "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
     Tcl_Preserve(framePtr);
diff --git a/generic/tkImage.c b/generic/tkImage.c
index ffa6f22..930fb7d 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -234,8 +234,8 @@ Tk_ImageObjCmd(
 	return TCL_ERROR;
     }
 
-    if (Tcl_GetIndexFromObj(interp, objv[1], imageOptions, "option", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], imageOptions,
+	    sizeof(char), "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
     switch ((enum options) index) {
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index bbc471e..35a4d0b 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -764,8 +764,8 @@ ImgBmapCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
 	return TCL_ERROR;
     }
-    if (Tcl_GetIndexFromObj(interp, objv[1], bmapOptions, "option", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], bmapOptions,
+	    sizeof(char), "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
     switch (index) {
diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c
index fed4da4..4de086d 100644
--- a/generic/tkImgGIF.c
+++ b/generic/tkImgGIF.c
@@ -425,8 +425,8 @@ FileReadGIF(
 	return TCL_ERROR;
     }
     for (i = 1; i < argc; i++) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], optionStrings, "option name",
-		0, &nBytes) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings,
+		sizeof(char), "option name", 0, &nBytes) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (i == (argc-1)) {
diff --git a/generic/tkImgPNG.c b/generic/tkImgPNG.c
index 267b1d9..593ab12 100644
--- a/generic/tkImgPNG.c
+++ b/generic/tkImgPNG.c
@@ -801,7 +801,7 @@ SkipChunk(
 /*
  * 4.3. Summary of standard chunks
  *
- * This table summarizes some properties of the standard chunk types. 
+ * This table summarizes some properties of the standard chunk types.
  *
  *	Critical chunks (must appear in this order, except PLTE is optional):
  *
@@ -2301,8 +2301,8 @@ ParseFormat(
     for (; objc>0 ; objc--, objv++) {
     	int optIndex;
 
-        if (Tcl_GetIndexFromObj(interp, objv[0], fmtOptions, "option", 0,
-		&optIndex) == TCL_ERROR) {
+        if (Tcl_GetIndexFromObjStruct(interp, objv[0], fmtOptions,
+		sizeof(char), "option", 0, &optIndex) == TCL_ERROR) {
             return TCL_ERROR;
 	}
 
@@ -3158,7 +3158,7 @@ WriteIDAT(
 
 	    *destPtr++ = srcPtr[blockPtr->offset[0]];
 
-	    /* 
+	    /*
 	     * If not grayscale, copy the green and blue channels.
 	     */
 
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
index 6f7869a..8830861 100644
--- a/generic/tkMenubutton.c
+++ b/generic/tkMenubutton.c
@@ -355,8 +355,8 @@ MenuButtonWidgetObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
 	return TCL_ERROR;
     }
-    result = Tcl_GetIndexFromObj(interp, objv[1], commandNames, "option", 0,
-	    &index);
+    result = Tcl_GetIndexFromObjStruct(interp, objv[1], commandNames,
+	    sizeof(char), "option", 0, &index);
     if (result != TCL_OK) {
 	return result;
     }
diff --git a/generic/tkMessage.c b/generic/tkMessage.c
index 5d4ca60..ef07a7c 100644
--- a/generic/tkMessage.c
+++ b/generic/tkMessage.c
@@ -318,8 +318,8 @@ MessageWidgetObjCmd(
 	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;
     }
 
diff --git a/generic/tkOption.c b/generic/tkOption.c
index ec9e465..9a6b306 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -631,8 +631,8 @@ Tk_OptionObjCmd(
 	return TCL_ERROR;
     }
 
-    result = Tcl_GetIndexFromObj(interp, objv[1], optionCmds, "option", 0,
-	    &index);
+    result = Tcl_GetIndexFromObjStruct(interp, objv[1], optionCmds,
+	    sizeof(char), "option", 0, &index);
     if (result != TCL_OK) {
 	return result;
     }
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index d2deee8..0c55651 100644
--- a/generic/ttk/ttkDefaultTheme.c
+++ b/generic/ttk/ttkDefaultTheme.c
@@ -722,8 +722,8 @@ static void MenubuttonArrowElementDraw(
     int width = 0, height = 0;
 
     Tk_GetPixelsFromObj(NULL, tkwin, arrow->sizeObj, &size);
-    Tcl_GetIndexFromObj(NULL, arrow->directionObj, directionStrings,
-	   ""/*message*/, 0/*flags*/, &postDirection);
+    Tcl_GetIndexFromObjStruct(NULL, arrow->directionObj, directionStrings,
+	   sizeof(char *), ""/*message*/, 0/*flags*/, &postDirection);
 
     /* ... this might not be such a great idea ... */
     switch (postDirection) {
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c
index 1d455d9..a5a3a52 100644
--- a/generic/ttk/ttkImage.c
+++ b/generic/ttk/ttkImage.c
@@ -36,7 +36,7 @@ static void NullImageChanged(ClientData clientData,
 
 /* TtkGetImageSpec --
  * 	Constructs a Ttk_ImageSpec * from a Tcl_Obj *.
- * 	Result must be released using TtkFreeImageSpec.  
+ * 	Result must be released using TtkFreeImageSpec.
  *
  * TODO: Need a variant of this that takes a user-specified ImageChanged proc
  */
@@ -364,8 +364,8 @@ Ttk_CreateImageElement(
 	}
 #endif
 
-	if (Tcl_GetIndexFromObj(interp, objv[i], optionStrings,
-		"option", 0, &option) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings,
+		sizeof(char *), "option", 0, &option) != TCL_OK) {
 	    goto error;
 	}
 
diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c
index 78676c6..dc6e994 100644
--- a/generic/ttk/ttkInit.c
+++ b/generic/ttk/ttkInit.c
@@ -21,8 +21,8 @@ int Ttk_GetButtonDefaultStateFromObj(
     Tcl_Interp *interp, Tcl_Obj *objPtr, int *statePtr)
 {
     *statePtr = TTK_BUTTON_DEFAULT_DISABLED;
-    return Tcl_GetIndexFromObj(interp, objPtr,
-	    ttkDefaultStrings, "default state", 0, statePtr);
+    return Tcl_GetIndexFromObjStruct(interp, objPtr, ttkDefaultStrings,
+	    sizeof(char *), "default state", 0, statePtr);
 }
 
 /*
@@ -38,8 +38,8 @@ int Ttk_GetCompoundFromObj(
     Tcl_Interp *interp, Tcl_Obj *objPtr, int *statePtr)
 {
     *statePtr = TTK_COMPOUND_NONE;
-    return Tcl_GetIndexFromObj(interp, objPtr,
-	    ttkCompoundStrings, "compound layout", 0, statePtr);
+    return Tcl_GetIndexFromObjStruct(interp, objPtr, ttkCompoundStrings,
+	    sizeof(char *), "compound layout", 0, statePtr);
 }
 
 /*
@@ -54,8 +54,8 @@ int Ttk_GetOrientFromObj(
     Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr)
 {
     *resultPtr = TTK_ORIENT_HORIZONTAL;
-    return Tcl_GetIndexFromObj(interp, objPtr,
-	    ttkOrientStrings, "orientation", 0, resultPtr);
+    return Tcl_GetIndexFromObjStruct(interp, objPtr, ttkOrientStrings,
+	    sizeof(char *), "orientation", 0, resultPtr);
 }
 
 /*
@@ -65,18 +65,18 @@ int Ttk_GetOrientFromObj(
 static const char *ttkStateStrings[] = {
     "normal", "readonly", "disabled", "active", NULL
 };
-enum { 
+enum {
     TTK_COMPAT_STATE_NORMAL,
     TTK_COMPAT_STATE_READONLY,
     TTK_COMPAT_STATE_DISABLED,
     TTK_COMPAT_STATE_ACTIVE
 };
 
-/* TtkCheckStateOption -- 
+/* TtkCheckStateOption --
  * 	Handle -state compatibility option.
  *
- *	NOTE: setting -state disabled / -state enabled affects the 
- *	widget state, but the internal widget state does *not* affect 
+ *	NOTE: setting -state disabled / -state enabled affects the
+ *	widget state, but the internal widget state does *not* affect
  *	the value of the -state option.
  *	This option is present for compatibility only.
  */
@@ -86,7 +86,8 @@ void TtkCheckStateOption(WidgetCore *corePtr, Tcl_Obj *objPtr)
     unsigned all = TTK_STATE_DISABLED|TTK_STATE_READONLY|TTK_STATE_ACTIVE;
 #   define SETFLAGS(f) TtkWidgetChangeState(corePtr, f, all^f)
 
-    (void)Tcl_GetIndexFromObj(NULL,objPtr,ttkStateStrings,"",0,&stateOption);
+    (void)Tcl_GetIndexFromObjStruct(NULL, objPtr, ttkStateStrings,
+	    sizeof(char *), "", 0, &stateOption);
     switch (stateOption) {
 	case TTK_COMPAT_STATE_NORMAL:
 	default:
@@ -174,7 +175,7 @@ int TtkGetOptionValue(
  * type name dbName dbClass default objOffset intOffset flags clientData mask
  */
 
-/* public */ 
+/* public */
 Tk_OptionSpec ttkCoreOptionSpecs[] =
 {
     {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor", NULL,
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;
 		    }
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;
     }
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index f4b14c9..adc2aef 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -731,9 +731,8 @@ static int PanedIdentifyCommand(
 
     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;
     }
diff --git a/generic/ttk/ttkScroll.c b/generic/ttk/ttkScroll.c
index f596bb4..7ac4f14 100644
--- a/generic/ttk/ttkScroll.c
+++ b/generic/ttk/ttkScroll.c
@@ -7,7 +7,7 @@
  *
  * Scrollable interface:
  *
- * 	+ 'first' is controlled by [xy]view widget command 
+ * 	+ 'first' is controlled by [xy]view widget command
  * 	  and other scrolling commands like 'see';
  *      + 'total' depends on widget contents;
  *      + 'last' depends on first, total, and widget size.
@@ -16,15 +16,15 @@
  *
  * 	1. User adjusts scrollbar, scrollbar widget calls its -command
  * 	2. Scrollbar -command invokes the scrollee [xy]view widget method
- * 	3. TtkScrollviewCommand calls TtkScrollTo(), which updates 
+ * 	3. TtkScrollviewCommand calls TtkScrollTo(), which updates
  * 	   'first' and schedules a redisplay.
- * 	4. Once the scrollee knows 'total' and 'last' (typically in 
- * 	   the LayoutProc), call TtkScrolled(h,first,last,total) to 
+ * 	4. Once the scrollee knows 'total' and 'last' (typically in
+ * 	   the LayoutProc), call TtkScrolled(h,first,last,total) to
  * 	   synchronize the scrollbar.
  * 	5. The scrollee -[xy]scrollcommand is called (in an idle callback)
  * 	6. Which calls the scrollbar 'set' method and redisplays the scrollbar.
  *
- * If the scrollee has internal scrolling (e.g., a 'see' method), 
+ * If the scrollee has internal scrolling (e.g., a 'see' method),
  * it should TtkScrollTo() directly (step 2).
  *
  * If the widget value changes, it should call TtkScrolled() (step 4).
@@ -78,6 +78,7 @@ static int UpdateScrollbar(Tcl_Interp *interp, ScrollHandle h)
     char arg1[TCL_DOUBLE_SPACE + 2];
     char arg2[TCL_DOUBLE_SPACE + 2];
     int code;
+    Tcl_DString buf;
 
     h->flags &= ~SCROLL_UPDATE_REQUIRED;
 
@@ -88,9 +89,14 @@ static int UpdateScrollbar(Tcl_Interp *interp, ScrollHandle h)
     arg1[0] = arg2[0] = ' ';
     Tcl_PrintDouble(interp, (double)s->first / s->total, arg1+1);
     Tcl_PrintDouble(interp, (double)s->last / s->total, arg2+1);
+    Tcl_DStringInit(&buf);
+    Tcl_DStringAppend(&buf, s->scrollCmd, -1);
+    Tcl_DStringAppend(&buf, arg1, -1);
+    Tcl_DStringAppend(&buf, arg2, -1);
 
     Tcl_Preserve(corePtr);
-    code = Tcl_VarEval(interp, s->scrollCmd, arg1, arg2, NULL);
+    code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
+    Tcl_DStringFree(&buf);
     if (WidgetDestroyed(corePtr)) {
 	Tcl_Release(corePtr);
 	return TCL_ERROR;
@@ -135,7 +141,7 @@ static void UpdateScrollbarBG(ClientData clientData)
 void TtkScrolled(ScrollHandle h, int first, int last, int total)
 {
     Scrollable *s = h->scrollPtr;
-    
+
     /* Sanity-check inputs:
      */
     if (total <= 0) {
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index d102be2..2f95962 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -1394,8 +1394,8 @@ static int StyleThemeCreateCmd(
 
     for (i=4; i < objc; i +=2) {
 	int option;
-	if (Tcl_GetIndexFromObj(
-	    interp, objv[i], optStrings, "option", 0, &option) != TCL_OK)
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], optStrings,
+	    sizeof(char *), "option", 0, &option) != TCL_OK)
 	{
 	    return TCL_ERROR;
 	}
@@ -1674,7 +1674,7 @@ StyleObjCmd(
     return Ttk_InvokeEnsemble(StyleEnsemble, 1, clientData,interp,objc,objv);
 }
 
-MODULE_SCOPE 
+MODULE_SCOPE
 int Ttk_InvokeEnsemble(	/* Run an ensemble command */
     const Ttk_Ensemble *ensemble, int cmdIndex,
     void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index dc0206c..c1ecf38 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -340,8 +340,8 @@ static int GetEnumSetFromObj(
 
     for (i = 0; i < objc; ++i) {
 	int index;
-	if (TCL_OK != Tcl_GetIndexFromObj(
-		    interp, objv[i], table, "value", TCL_EXACT, &index))
+	if (TCL_OK != Tcl_GetIndexFromObjStruct(interp, objv[i], table,
+		sizeof(char *), "value", TCL_EXACT, &index))
 	{
 	    return TCL_ERROR;
 	}
@@ -2287,8 +2287,8 @@ static int TreeviewIdentifyCommand(
 	return TCL_ERROR;
     }
 
-    if (   Tcl_GetIndexFromObj(interp, objv[2],
-		submethodStrings, "command", TCL_EXACT, &submethod) != TCL_OK
+    if (Tcl_GetIndexFromObjStruct(interp, objv[2], submethodStrings,
+		sizeof(char *), "command", TCL_EXACT, &submethod) != TCL_OK
         || Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK
 	|| Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK
     ) {
@@ -2955,8 +2955,8 @@ static int TreeviewSelectionCommand(
 	return TCL_ERROR;
     }
 
-    if (Tcl_GetIndexFromObj(interp, objv[2], selopStrings,
-	    "selection operation", 0, &selop) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[2], selopStrings,
+	    sizeof(char *), "selection operation", 0, &selop) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c
index 016653d..464be78 100644
--- a/generic/ttk/ttkWidget.c
+++ b/generic/ttk/ttkWidget.c
@@ -766,8 +766,8 @@ int TtkWidgetIdentifyCommand(
     }
     if (objc == 5) {
 	/* $w identify element $x $y */
-	if (Tcl_GetIndexFromObj(interp,objv[2],whatTable,"option",0,&what)
-		!= TCL_OK)
+	if (Tcl_GetIndexFromObjStruct(interp, objv[2], whatTable,
+		sizeof(char *), "option", 0, &what) != TCL_OK)
 	{
 	    return TCL_ERROR;
 	}
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 2610e3a..52768c6 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -404,8 +404,8 @@ TkMacOSXIconBitmapObjCmd(
     if (Tcl_GetIntFromObj(interp, objv[i++], &ib.height) != TCL_OK) {
 	goto end;
     }
-    if (Tcl_GetIndexFromObj(interp, objv[i++], iconBitmapOptionStrings,
-	    "kind", TCL_EXACT, &ib.kind) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[i++], iconBitmapOptionStrings,
+	    sizeof(char *), "kind", TCL_EXACT, &ib.kind) != TCL_OK) {
 	goto end;
     }
     value = Tcl_GetStringFromObj(objv[i++], &len);
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index a0eef7c..a66939a 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -259,8 +259,8 @@ Tk_ChooseColorObjCmd(
 	int index;
 	const char *value;
 
-	if (Tcl_GetIndexFromObj(interp, objv[i], colorOptionStrings, "option",
-		TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], colorOptionStrings,
+		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
 	if (i + 1 == objc) {
@@ -373,8 +373,8 @@ Tk_GetOpenFileObjCmd(
 
     TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], openOptionStrings, "option",
-		TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], openOptionStrings,
+		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
 	if (i + 1 == objc) {
@@ -552,8 +552,8 @@ Tk_GetSaveFileObjCmd(
 
     TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], saveOptionStrings, "option",
-		TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], saveOptionStrings,
+		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
 	if (i + 1 == objc) {
@@ -722,8 +722,8 @@ Tk_ChooseDirectoryObjCmd(
     NSInteger returnCode = NSAlertErrorReturn;
 
     for (i = 1; i < objc; i += 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], chooseOptionStrings, "option",
-		TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], chooseOptionStrings,
+		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
 	if (i + 1 == objc) {
@@ -939,8 +939,8 @@ Tk_MessageBoxObjCmd(
     iconIndex = ICON_INFO;
     typeIndex = TYPE_OK;
     for (i = 1; i < objc; i += 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], alertOptionStrings, "option",
-		TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], alertOptionStrings,
+		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
 	if (i + 1 == objc) {
@@ -967,8 +967,8 @@ Tk_MessageBoxObjCmd(
 	    break;
 
 	case ALERT_ICON:
-	    if (Tcl_GetIndexFromObj(interp, objv[i + 1], alertIconStrings,
-		    "value", TCL_EXACT, &iconIndex) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i + 1], alertIconStrings,
+		    sizeof(char *), "value", TCL_EXACT, &iconIndex) != TCL_OK) {
 		goto end;
 	    }
 	    break;
@@ -997,8 +997,8 @@ Tk_MessageBoxObjCmd(
 	    break;
 
 	case ALERT_TYPE:
-	    if (Tcl_GetIndexFromObj(interp, objv[i + 1], alertTypeStrings,
-		    "value", TCL_EXACT, &typeIndex) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i + 1], alertTypeStrings,
+		    sizeof(char *), "value", TCL_EXACT, &typeIndex) != TCL_OK) {
 		goto end;
 	    }
 	    break;
@@ -1013,8 +1013,8 @@ Tk_MessageBoxObjCmd(
 	 * why we do this here.
 	 */
 
-	if (Tcl_GetIndexFromObj(interp, objv[indexDefaultOption + 1],
-		alertButtonStrings, "value", TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[indexDefaultOption + 1],
+		alertButtonStrings, sizeof(char *), "value", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
 
@@ -1357,8 +1357,8 @@ FontchooserConfigureCmd(
     for (i = 1; i < objc; i += 2) {
 	int optionIndex, len;
 
-	if (Tcl_GetIndexFromObj(interp, objv[i], fontchooserOptionStrings,
-		"option", 0, &optionIndex) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], fontchooserOptionStrings,
+		sizeof(char *), "option", 0, &optionIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (objc == 2) {
diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c
index ce5e65b..3b24a56 100644
--- a/macosx/tkMacOSXSend.c
+++ b/macosx/tkMacOSXSend.c
@@ -336,8 +336,8 @@ Tk_SendObjCmd(
     for (i = 1; i < (objc - 1); ) {
 	stringRep = Tcl_GetString(objv[i]);
 	if (stringRep[0] == '-') {
-	    if (Tcl_GetIndexFromObj(interp, objv[i], sendOptions, "option", 0,
-		    &index) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i], sendOptions,
+		    sizeof(char *), "option", 0, &index) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (index == 0) {
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 4ae2ebf..370c86a 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -892,8 +892,8 @@ Tk_WmObjCmd(
 	return Tcl_GetBooleanFromObj(interp, objv[2], &wmTracing);
     }
 
-    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;
     }
 
@@ -1293,8 +1293,8 @@ WmAttributesCmd(
 	}
 	Tcl_SetObjResult(interp, result);
     } else if (objc == 4)  {	/* wm attributes $win -attribute */
-	if (Tcl_GetIndexFromObj(interp, objv[3], WmAttributeNames,
-		"attribute", 0, &attribute) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], WmAttributeNames,
+		sizeof(char *), "attribute", 0, &attribute) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	Tcl_SetObjResult(interp, WmGetAttribute(winPtr, macWindow, attribute));
@@ -1302,8 +1302,8 @@ WmAttributesCmd(
 	int i;
 
 	for (i = 3; i < objc; i += 2) {
-	    if (Tcl_GetIndexFromObj(interp, objv[i], WmAttributeNames,
-		    "attribute", 0, &attribute) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i], WmAttributeNames,
+		    sizeof(char *), "attribute", 0, &attribute) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (WmSetAttribute(winPtr, macWindow, interp, attribute, objv[i+1])
@@ -1613,8 +1613,8 @@ WmFocusmodelCmd(
 	return TCL_OK;
     }
 
-    if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+	    sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
     if (index == OPT_ACTIVE) {
@@ -2672,8 +2672,8 @@ WmPositionfromCmd(
     if (*Tcl_GetString(objv[3]) == '\0') {
 	wmPtr->sizeHintsFlags &= ~(USPosition|PPosition);
     } else {
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+		sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (index == OPT_USER) {
@@ -2913,8 +2913,8 @@ WmSizefromCmd(
     if (*Tcl_GetString(objv[3]) == '\0') {
 	wmPtr->sizeHintsFlags &= ~(USSize|PSize);
     } else {
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+		sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (index == OPT_USER) {
@@ -3042,8 +3042,8 @@ WmStackorderCmd(
 
 	ckfree(windows);
 
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+		sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (index == OPT_ISABOVE) {
@@ -3109,8 +3109,8 @@ WmStateCmd(
 	    return TCL_ERROR;
 	}
 
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+		sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
@@ -5132,8 +5132,8 @@ TkUnsupported1ObjCmd(
 	return TCL_ERROR;
     }
 
-    if (Tcl_GetIndexFromObj(interp, objv[1], subcmds, "option", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], subcmds,
+	    sizeof(char *), "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
     if (((enum SubCmds) index) == TKMWS_STYLE) {
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index e22f520..069247e 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -356,8 +356,8 @@ Tk_ChooseColorObjCmd(
 	optionPtr = objv[i];
 	valuePtr = objv[i + 1];
 
-	if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option",
-		TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, optionPtr, optionStrings,
+		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (i + 1 == objc) {
@@ -1382,8 +1382,8 @@ Tk_ChooseDirectoryObjCmd(
 	optionPtr = objv[i];
 	valuePtr = objv[i + 1];
 
-	if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, optionPtr, optionStrings,
+		sizeof(char *), "option", 0, &index) != TCL_OK) {
 	    goto cleanup;
 	}
 	if (i + 1 == objc) {
@@ -1773,8 +1773,8 @@ Tk_MessageBoxObjCmd(
 	optionPtr = objv[i];
 	valuePtr = objv[i + 1];
 
-	if (Tcl_GetIndexFromObj(interp, optionPtr, optionStrings, "option",
-		TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, optionPtr, optionStrings,
+		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (i + 1 == objc) {
@@ -2260,8 +2260,8 @@ FontchooserConfigureCmd(
     for (i = 1; i < objc; i += 2) {
 	int optionIndex, len;
 
-	if (Tcl_GetIndexFromObj(interp, objv[i], optionStrings,
-		"option", 0, &optionIndex) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings,
+		sizeof(char *),  "option", 0, &optionIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (objc == 2) {
diff --git a/win/tkWinSend.c b/win/tkWinSend.c
index 43cb741..7fde655 100644
--- a/win/tkWinSend.c
+++ b/win/tkWinSend.c
@@ -333,8 +333,8 @@ Tk_SendObjCmd(
      */
 
     for (i = 1; i < objc; i++) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], sendOptions,
-		"option", 0, &optind) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], sendOptions,
+		sizeof(char *), "option", 0, &optind) != TCL_OK) {
 	    break;
 	}
 	if (optind == SEND_ASYNC) {
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 040a712..28850d5 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -2838,8 +2838,8 @@ Tk_WmObjCmd(
 	return TCL_OK;
     }
 
-    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;
     }
 
@@ -3625,8 +3625,8 @@ WmFocusmodelCmd(
 	return TCL_OK;
     }
 
-    if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+	    sizeof(char *), "argument", 0,&index) != TCL_OK) {
 	return TCL_ERROR;
     }
     if (index == OPT_ACTIVE) {
@@ -4900,8 +4900,8 @@ WmPositionfromCmd(
     if (*Tcl_GetString(objv[3]) == '\0') {
 	wmPtr->sizeHintsFlags &= ~(USPosition|PPosition);
     } else {
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+		sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (index == OPT_USER) {
@@ -5127,8 +5127,8 @@ WmSizefromCmd(
     if (*Tcl_GetString(objv[3]) == '\0') {
 	wmPtr->sizeHintsFlags &= ~(USSize|PSize);
     } else {
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+		sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (index == OPT_USER) {
@@ -5257,8 +5257,8 @@ WmStackorderCmd(
 
 	ckfree(windows);
 
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+		sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (index == OPT_ISABOVE) {
@@ -5317,13 +5317,8 @@ WmStateCmd(
 	    Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "ICON", NULL);
 	    return TCL_ERROR;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-
-	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], optionStrings,
+		sizeof(char *), "argument", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c
index 04baa16..c6e906b 100644
--- a/win/ttkWinMonitor.c
+++ b/win/ttkWinMonitor.c
@@ -74,7 +74,7 @@ CreateThemeMonitorWindow(HINSTANCE hinst, Tcl_Interp *interp)
     HWND       hwnd = NULL;
     TCHAR      title[32] = TEXT("TtkMonitorWindow");
     TCHAR      name[32] = TEXT("TtkMonitorClass");
-    
+
     wc.cbSize        = sizeof(WNDCLASSEX);
     wc.style         = CS_HREDRAW | CS_VREDRAW;
     wc.lpfnWndProc   = (WNDPROC)WndProc;
@@ -99,7 +99,7 @@ CreateThemeMonitorWindow(HINSTANCE hinst, Tcl_Interp *interp)
     return hwnd;
 }
 
-static void 
+static void
 DestroyThemeMonitorWindow(void *clientData)
 {
     HWND hwnd = (HWND)clientData;
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 7fdd398..1a5e934 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1068,8 +1068,8 @@ GetSysFlagFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr)
     }
     for (i = 0; i < objc; ++i) {
 	int option;
-	if (Tcl_GetIndexFromObj(interp, objv[i], names, "system constant", 0, &option)
-		!= TCL_OK)
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], names,
+		sizeof(char *), "system constant", 0, &option) != TCL_OK)
 	    return TCL_ERROR;
 	*resultPtr |= (flags[option] << (8 * (1 - i)));
     }
@@ -1140,8 +1140,8 @@ Ttk_CreateVsapiElement(
 		Tcl_SetErrorCode(interp, "TTK", "VSAPI", "MISSING", NULL);
 		return TCL_ERROR;
 	    }
-	    if (Tcl_GetIndexFromObj(interp, objv[i], optionStrings,
-		    "option", 0, &option) != TCL_OK)
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i], optionStrings,
+		    sizeof(char *), "option", 0, &option) != TCL_OK)
 		return TCL_ERROR;
 	    switch (option) {
 	    case O_PADDING: