diff options
Diffstat (limited to 'generic/tkMenuDraw.c')
| -rw-r--r-- | generic/tkMenuDraw.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c index 275b9f5..4510c96 100644 --- a/generic/tkMenuDraw.c +++ b/generic/tkMenuDraw.c @@ -633,7 +633,7 @@ DisplayMenu( return; } - Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthPtr, + Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthObj, &borderWidth); border = Tk_Get3DBorderFromObj(menuPtr->tkwin, menuPtr->borderPtr); @@ -670,25 +670,25 @@ DisplayMenu( &menuMetrics, mePtr->x, mePtr->y, mePtr->width, mePtr->height, strictMotif, 1); - if (mePtr->entryFlags & ENTRY_LAST_COLUMN) { + 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. - */ + /* + * 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); - } + 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. - */ + /* + * Paint the area under the last entry in a column. + */ mePtr = menuPtr->entries[index - 1]; Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border, @@ -708,9 +708,9 @@ DisplayMenu( } else { mePtr = menuPtr->entries[menuPtr->numEntries - 1]; - /* - * Paint the area under the last entry of the menu. - */ + /* + * 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, @@ -722,10 +722,10 @@ DisplayMenu( 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. - */ + /* + * 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); @@ -989,7 +989,7 @@ AdjustMenuCoords( } else { int borderWidth, activeBorderWidth; - Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthPtr, + Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthObj, &borderWidth); Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->activeBorderWidthPtr, &activeBorderWidth); |