diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-10-25 21:06:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-10-25 21:06:25 (GMT) |
| commit | 0d5336db012f45753abace489f18f0ca299c6961 (patch) | |
| tree | b1bf3280a9046df99226158978502eeb26f5b0a3 /win/tkWinMenu.c | |
| parent | e97381a6d921de403516d5b761539a450f4af83c (diff) | |
| parent | 1320b8a2a9c1269a345d44d673a7a35707fbbe9c (diff) | |
| download | tk-core-tip-626.zip tk-core-tip-626.tar.gz tk-core-tip-626.tar.bz2 | |
Merge 9.0core-tip-626
Diffstat (limited to 'win/tkWinMenu.c')
| -rw-r--r-- | win/tkWinMenu.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index cc731a2..e69a689 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -1238,11 +1238,13 @@ TkWinHandleMenuEvent( interp = menuPtr->interp; Tcl_Preserve(interp); + Tcl_Preserve(menuPtr); code = TkInvokeMenu(interp, menuPtr, mePtr->index); if (code != TCL_OK && code != TCL_CONTINUE && code != TCL_BREAK) { Tcl_AddErrorInfo(interp, "\n (menu invoke)"); Tcl_BackgroundException(interp, code); } + Tcl_Release(menuPtr); Tcl_Release(interp); *plResult = 0; returnResult = 1; @@ -1433,7 +1435,7 @@ TkWinHandleMenuEvent( TkActivateMenuEntry(menuPtr, TCL_INDEX_NONE); } else { if (mePtr->index >= (int)menuPtr->numEntries) { - Tcl_Panic("Trying to activate an entry which doesn't exist"); + Tcl_Panic("Trying to activate an entry which does not exist"); } TkActivateMenuEntry(menuPtr, mePtr->index); } @@ -1598,7 +1600,7 @@ GetMenuIndicatorGeometry( int borderWidth; Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin, - menuPtr->borderWidthPtr, &borderWidth); + menuPtr->borderWidthObj, &borderWidth); *widthPtr = indicatorDimensions[1] - borderWidth; /* @@ -1842,7 +1844,7 @@ DrawMenuEntryIndicator( rect.top = y; rect.bottom = y + mePtr->height; Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin, - menuPtr->borderWidthPtr, &borderWidth); + menuPtr->borderWidthObj, &borderWidth); Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin, menuPtr->activeBorderWidthPtr, &activeBorderWidth); rect.left = borderWidth + activeBorderWidth + x; @@ -2942,7 +2944,7 @@ DrawMenuEntryBackground( || (menuPtr->postedCascade != mePtr))) { relief = TK_RELIEF_FLAT; } else { - Tk_GetReliefFromObj(NULL, menuPtr->activeReliefPtr, &relief); + relief = menuPtr->activeRelief; } Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->activeBorderWidthPtr, &activeBorderWidth); @@ -2988,7 +2990,7 @@ TkpComputeStandardMenuGeometry( } Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin, - menuPtr->borderWidthPtr, &borderWidth); + menuPtr->borderWidthObj, &borderWidth); x = y = borderWidth; indicatorSpace = labelWidth = accelWidth = 0; windowHeight = 0; |