summaryrefslogtreecommitdiffstats
path: root/mac/tkMacMenubutton.c
diff options
context:
space:
mode:
authorhobbs <hobbs>1999-09-21 06:42:16 (GMT)
committerhobbs <hobbs>1999-09-21 06:42:16 (GMT)
commitf29a5be23f295f3e213d950ffbbea8ccbc06c8b5 (patch)
treecbe860d1508f98a6d812f3f3090568a2d2f0bdbe /mac/tkMacMenubutton.c
parentc0f23beb65e9af4511e5e455ca71039be233300b (diff)
downloadtk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.zip
tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.tar.gz
tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.tar.bz2
1999-09-16 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 1999-09-15 Jeff Hobbs <hobbs@scriptics.com> * 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 (readjust from 8-21 fix) 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] 1999-09-14 Jeff Hobbs <hobbs@scriptics.com> * win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909]
Diffstat (limited to 'mac/tkMacMenubutton.c')
-rw-r--r--mac/tkMacMenubutton.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mac/tkMacMenubutton.c b/mac/tkMacMenubutton.c
index 698ac97..41dc954 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.6 1999/09/21 06:42:33 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),