summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-11-13 09:11:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-11-13 09:11:20 (GMT)
commit357bbf66b1c1842cfadce2a19cc0c13401a732cc (patch)
treef53a2b8883863182a143453e9cffe290a6fd63dc
parente0d493a2cccffb118444254433014f937714a5bc (diff)
parent7b18f8549882ec8e98fe379f497f934aa730f1ef (diff)
downloadtk-357bbf66b1c1842cfadce2a19cc0c13401a732cc.zip
tk-357bbf66b1c1842cfadce2a19cc0c13401a732cc.tar.gz
tk-357bbf66b1c1842cfadce2a19cc0c13401a732cc.tar.bz2
Merge 8.7 (this should fix the Windows "symbols" build)
-rw-r--r--generic/tkCanvas.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 2d90e36..2b5568d 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -498,8 +498,9 @@ ItemIndex(
return itemPtr->typePtr->indexProc(interp, (Tk_Canvas) canvasPtr,
itemPtr, objPtr, indexPtr);
} else {
-#if defined(TK_NO_DEPRECATED) || (TK_MAJOR_VERSION > 8)
- Tcl_Panic("Flag TK_CONFIG_OBJS is mandatory");
+#if defined(TK_NO_DEPRECATED)
+ Tcl_AppendResult(interp, "Flag TK_CONFIG_OBJS is mandatory", (void *)NULL);
+ return TCL_ERROR;
#else
return itemPtr->typePtr->indexProc(interp, (Tk_Canvas) canvasPtr,
itemPtr, (Tcl_Obj *) Tcl_GetString(objPtr), indexPtr);