diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-08 21:20:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-08 21:20:46 (GMT) |
| commit | d0a67ec8ad6eebde787857604c064981cb8e7666 (patch) | |
| tree | 1a2aafaade36559c669fe0f971cb34ea5f8f34e7 /generic/tkMenu.c | |
| parent | 3df7a0ff7653cafb8cfbba58cf29067155337ea8 (diff) | |
| download | tk-d0a67ec8ad6eebde787857604c064981cb8e7666.zip tk-d0a67ec8ad6eebde787857604c064981cb8e7666.tar.gz tk-d0a67ec8ad6eebde787857604c064981cb8e7666.tar.bz2 | |
Restore "$menu index" to return "none" for no index (for compatibility with Tk 8.6)
Diffstat (limited to 'generic/tkMenu.c')
| -rw-r--r-- | generic/tkMenu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index d3551f9..eacdffb 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -856,12 +856,15 @@ MenuWidgetObjCmd( if (GetMenuIndex(interp, menuPtr, objv[2], 0, &index) != TCL_OK) { goto error; } -#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9) if (index < 0) { +#if defined(TK_NO_DEPRECATED) Tcl_SetObjResult(interp, Tcl_NewObj()); - } else +#else + Tcl_SetObjResult(interp, Tcl_NewStringObj("none", TCL_INDEX_NONE)); #endif - Tcl_SetObjResult(interp, TkNewIndexObj(index)); + } else { + Tcl_SetObjResult(interp, TkNewIndexObj(index)); + } break; } case MENU_INSERT: |