diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-11 21:58:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-11 21:58:15 (GMT) |
| commit | b2a490e00b366529ee01568a6e3eb47fd718d59f (patch) | |
| tree | a29d52a3dbbbf0de75a893365d283a51a95ad24c /generic/tkMenu.c | |
| parent | 214d96af007b0c11714f5d497a37405807450a72 (diff) | |
| parent | e5e9aa998d3fc89826a2546bf137cc70f70aa4ea (diff) | |
| download | tk-b2a490e00b366529ee01568a6e3eb47fd718d59f.zip tk-b2a490e00b366529ee01568a6e3eb47fd718d59f.tar.gz tk-b2a490e00b366529ee01568a6e3eb47fd718d59f.tar.bz2 | |
Merge 8.6. Some C++-fixes
Diffstat (limited to 'generic/tkMenu.c')
| -rw-r--r-- | generic/tkMenu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index a16c6c4..e573a82 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -840,7 +840,7 @@ MenuWidgetObjCmd( } entryPtr = menuPtr->entries[index]->entryPtr; if (entryPtr) { - idStr = Tcl_GetHashKey(&menuPtr->items, entryPtr); + idStr = (const char *)Tcl_GetHashKey(&menuPtr->items, entryPtr); Tcl_SetObjResult(interp, Tcl_NewStringObj(idStr, TCL_INDEX_NONE)); } break; @@ -1218,7 +1218,7 @@ DestroyMenuInstance( */ Tcl_EventuallyFree(menuPtr->entries[i], - (Tcl_FreeProc*)DestroyMenuEntry); + DestroyMenuEntry); menuPtr->numEntries = i; } if (menuPtr->entries != NULL) { @@ -1663,7 +1663,7 @@ ConfigureMenu( } else if ((menuListPtr->numEntries > 0) && (menuListPtr->entries[0]->type == TEAROFF_ENTRY)) { - Tcl_EventuallyFree(menuListPtr->entries[0], (Tcl_FreeProc *) DestroyMenuEntry); + Tcl_EventuallyFree(menuListPtr->entries[0], DestroyMenuEntry); for (i = 0; i < (int)menuListPtr->numEntries - 1; i++) { menuListPtr->entries[i] = menuListPtr->entries[i + 1]; @@ -2197,7 +2197,7 @@ GetMenuIndex( entryPtr = Tcl_FindHashEntry(&menuPtr->items, string); if (entryPtr) { - TkMenuEntry *mePtr = Tcl_GetHashValue(entryPtr); + TkMenuEntry *mePtr = (TkMenuEntry *)Tcl_GetHashValue(entryPtr); *indexPtr = mePtr->index; return TCL_OK; } @@ -2458,7 +2458,7 @@ MenuAddOrInsert( errorMenuPtr != NULL; errorMenuPtr = errorMenuPtr->nextInstancePtr) { Tcl_EventuallyFree(errorMenuPtr->entries[index], - (Tcl_FreeProc *) DestroyMenuEntry); + DestroyMenuEntry); for (i = index; i < errorMenuPtr->numEntries - 1; i++) { errorMenuPtr->entries[i] = errorMenuPtr->entries[i + 1]; errorMenuPtr->entries[i]->index = i; @@ -3612,7 +3612,7 @@ DeleteMenuCloneEntries( for (menuListPtr = menuPtr->mainMenuPtr; menuListPtr != NULL; menuListPtr = menuListPtr->nextInstancePtr) { for (i = last; i >= first; i--) { - Tcl_EventuallyFree(menuListPtr->entries[i], (Tcl_FreeProc *) DestroyMenuEntry); + Tcl_EventuallyFree(menuListPtr->entries[i], DestroyMenuEntry); } for (i = last + 1; i < (int)menuListPtr->numEntries; i++) { j = i - numDeleted; |