ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Tk 8.6.11

Browse Source
This commit is contained in:
Steve Dower
2021-03-30 00:54:10 +01:00
parent 42c69189d9
commit 070b8750b0
403 changed files with 21608 additions and 16269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
generic/tkMenuDraw.c
View File

@@ -668,8 +668,27 @@ DisplayMenu(
TkpDrawMenuEntry(mePtr, Tk_WindowId(menuPtr->tkwin), tkfont,
&menuMetrics, mePtr->x, mePtr->y, mePtr->width,
mePtr->height, strictMotif, 1);
if (mePtr->entryFlags & ENTRY_LAST_COLUMN) {
/*
* Paint the area at the right of an entry in the last column.
* This has zero width except after menu resizing.
*/
Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border,
mePtr->x + mePtr->width, mePtr->y,
Tk_Width(tkwin) - mePtr->x - mePtr->width - borderWidth,
mePtr->height, 0, TK_RELIEF_FLAT);
}
if ((index > 0) && (menuPtr->menuType != MENUBAR)
&& mePtr->columnBreak) {
/*
* Paint the area under the last entry in a column.
*/
mePtr = menuPtr->entries[index - 1];
Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border,
mePtr->x, mePtr->y + mePtr->height, mePtr->width,
@@ -687,6 +706,11 @@ DisplayMenu(
height = Tk_Height(tkwin) - 2 * borderWidth;
} else {
mePtr = menuPtr->entries[menuPtr->numEntries - 1];
/*
* Paint the area under the last entry of the menu.
*/
Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin),
border, mePtr->x, mePtr->y + mePtr->height, mePtr->width,
Tk_Height(tkwin) - mePtr->y - mePtr->height - borderWidth,
@@ -696,6 +720,12 @@ DisplayMenu(
width = Tk_Width(tkwin) - x - borderWidth;
height = Tk_Height(tkwin) - y - borderWidth;
}
/*
* Paint the area at the bottom right of the last entry.
* This has zero width except after menu resizing.
*/
Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border, x, y,
width, height, 0, TK_RELIEF_FLAT);
}