diff options
| author | hobbs <hobbs> | 1999-09-22 06:53:07 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 1999-09-22 06:53:07 (GMT) |
| commit | 34e1f07231357ed71ef318a9d7c0bd880432f529 (patch) | |
| tree | 70b025d7d49df577a1cdea2a30d1bca75f4e6260 /mac | |
| parent | c87e8a004b0f429eae82f59f102168a67926445d (diff) | |
| download | tk-34e1f07231357ed71ef318a9d7c0bd880432f529.zip tk-34e1f07231357ed71ef318a9d7c0bd880432f529.tar.gz tk-34e1f07231357ed71ef318a9d7c0bd880432f529.tar.bz2 | |
1999-09-21 Jeff Hobbs <hobbs@scriptics.com>
* generic/tkFont.c: fixed processing of font options and error
returned [Bug: 2075]
* win/tkWinWm.c: fixed bug in 'wm deiconify' that raised the
wrong toplevel, and changed it to not set focus on overridden
toplevels
* unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug: 2070]
and fix to AIX-* to get ldAix right [Bug: 2624], fixed AIX
version check and several other config fixes for AIX
* mac/tkMacMenubutton.c:
* unix/tkUnixMenubu.c: fixed permanently stippled menubutton image
* win/tkWinButton.c: fixed possible pointer smash [Bug: 2733]
* win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909]
* unix/tkUnixDraw.c: fixed header style for TkpDrawHighlightBorder
* generic/tkCanvas.c: fixed GC error (bg <> fg) in tkCanvas.c
(from code added to support TkpDrawHighlightBorder) [Bug: 2676]
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/tkMacMenubutton.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mac/tkMacMenubutton.c b/mac/tkMacMenubutton.c index 698ac97..c928864 100644 --- a/mac/tkMacMenubutton.c +++ b/mac/tkMacMenubutton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacMenubutton.c,v 1.5 1999/08/10 05:05:02 jingham Exp $ + * RCS: @(#) $Id: tkMacMenubutton.c,v 1.5.4.1 1999/09/22 06:53:14 hobbs Exp $ */ #include "tkMenubutton.h" @@ -163,8 +163,8 @@ TkpDisplayMenuButton( * foreground color, generate the stippled effect. */ - if ((mbPtr->state == STATE_DISABLED && mbPtr->disabledFg != NULL) - || (mbPtr->image != NULL)) { + if ((mbPtr->state == STATE_DISABLED) + && ((mbPtr->disabledFg != NULL) || (mbPtr->image != NULL))) { XFillRectangle(mbPtr->display, Tk_WindowId(tkwin), mbPtr->disabledGC, mbPtr->inset, mbPtr->inset, (unsigned) (Tk_Width(tkwin) - 2*mbPtr->inset), |