diff options
| author | hobbs <hobbs> | 1999-12-21 23:56:33 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 1999-12-21 23:56:33 (GMT) |
| commit | af7ee473b79083a6795f5ab9300f64b4c1961b3c (patch) | |
| tree | 3e1d623e322ec0ee93f04c760ab3f0937a3ef4d6 /unix/tkUnixMenu.c | |
| parent | fdba0d6552ccb3b13cdb2b5f6ba531ebff096158 (diff) | |
| download | tk-af7ee473b79083a6795f5ab9300f64b4c1961b3c.zip tk-af7ee473b79083a6795f5ab9300f64b4c1961b3c.tar.gz tk-af7ee473b79083a6795f5ab9300f64b4c1961b3c.tar.bz2 | |
* unix/configure.in:
* README: updated for patch level 8.3b1
* unix/tkUnixWm.c: fixed panic in Tk_CoordsToWindow to print error
and continue instead (for Tix) [Bug: 716 et al]
* unix/tkUnixMenu.c:
* unix/tkUnixFont.c:
* generic/tkImgPPM.c: removed extranneous vars that were set but
never used.
* unix/aclocal.m4: removed -O flag for AIX when using the IBM
compiler (several versions have a bug that crops up in the text
widget). [Bug: 2316]
* unix/Makefile.in: removed extra slash in SCRIPT_INSTALL_DIR
[Bug: 3896]
Diffstat (limited to 'unix/tkUnixMenu.c')
| -rw-r--r-- | unix/tkUnixMenu.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c index 1a499cc..cf392e4 100644 --- a/unix/tkUnixMenu.c +++ b/unix/tkUnixMenu.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixMenu.c,v 1.3 1999/04/16 01:51:46 stanton Exp $ + * RCS: @(#) $Id: tkUnixMenu.c,v 1.4 1999/12/21 23:56:34 hobbs Exp $ */ #include "tkPort.h" @@ -658,14 +658,12 @@ DrawMenuSeparator(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y, width, height) int height; { XPoint points[2]; - int margin; Tk_3DBorder border; if (menuPtr->menuType == MENUBAR) { return; } - margin = (fmPtr->ascent + fmPtr->descent)/2; points[0].x = x; points[0].y = y + height/2; points[1].x = width - 1; @@ -936,7 +934,7 @@ TkpComputeMenubarGeometry(menuPtr) Tk_FontMetrics menuMetrics, entryMetrics, *fmPtr; int width, height; int i, j; - int x, y, currentRowHeight, currentRowWidth, maxWidth; + int x, y, currentRowHeight, maxWidth; int maxWindowWidth; int lastRowBreak; int helpMenuIndex = -1; @@ -969,7 +967,6 @@ TkpComputeMenubarGeometry(menuPtr) &borderWidth); x = y = borderWidth; lastRowBreak = 0; - currentRowWidth = 0; /* * On the Mac especially, getting font metrics can be quite slow, @@ -1135,14 +1132,13 @@ DrawTearoffEntry(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, y, width, height) int height; { XPoint points[2]; - int margin, segmentWidth, maxX; + int segmentWidth, maxX; Tk_3DBorder border; if (menuPtr->menuType != MASTER_MENU) { return; } - margin = (fmPtr->ascent + fmPtr->descent)/2; points[0].x = x; points[0].y = y + height/2; points[1].y = points[0].y; |