diff options
Diffstat (limited to 'unix/tkUnixMenubu.c')
| -rw-r--r-- | unix/tkUnixMenubu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index 9578bc0..c9a33aa 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -4,7 +4,7 @@ * This file implements the Unix specific portion of the menubutton * widget. * - * Copyright (c) 1996-1997 Sun Microsystems, Inc. + * Copyright © 1996-1997 Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. @@ -56,7 +56,7 @@ TkpCreateMenuButton( void TkpDisplayMenuButton( - ClientData clientData) /* Information about widget. */ + void *clientData) /* Information about widget. */ { TkMenuButton *mbPtr = (TkMenuButton *)clientData; GC gc; @@ -279,7 +279,7 @@ TkpDisplayMenuButton( Tk_Height(tkwin) - 2*mbPtr->highlightWidth, mbPtr->borderWidth, mbPtr->relief); } - if (mbPtr->highlightWidth != 0) { + if (mbPtr->highlightWidth > 0) { if (mbPtr->flags & GOT_FOCUS) { gc = Tk_GCForColor(mbPtr->highlightColorPtr, pixmap); } else { @@ -317,7 +317,7 @@ TkpDisplayMenuButton( void TkpDestroyMenuButton( - TkMenuButton *mbPtr) + TCL_UNUSED(TkMenuButton *)) { } @@ -368,7 +368,7 @@ TkpComputeMenuButtonGeometry( Tk_FreeTextLayout(mbPtr->textLayout); mbPtr->textLayout = Tk_ComputeTextLayout(mbPtr->tkfont, mbPtr->text, - -1, mbPtr->wrapLength, mbPtr->justify, 0, &mbPtr->textWidth, + TCL_INDEX_NONE, mbPtr->wrapLength, mbPtr->justify, 0, &mbPtr->textWidth, &mbPtr->textHeight); txtWidth = mbPtr->textWidth; txtHeight = mbPtr->textHeight; |