diff options
| author | jingham <jingham> | 1999-08-07 18:54:37 (GMT) |
|---|---|---|
| committer | jingham <jingham> | 1999-08-07 18:54:37 (GMT) |
| commit | 2b3c7c3a96bc23516d033347bb4be9136c35605a (patch) | |
| tree | 25960aff763c5f25e8fca064e94daee0bbb8e7ab | |
| parent | e62407589a11501239b6535a0ec8982eb2e719ed (diff) | |
| download | tk-2b3c7c3a96bc23516d033347bb4be9136c35605a.zip tk-2b3c7c3a96bc23516d033347bb4be9136c35605a.tar.gz tk-2b3c7c3a96bc23516d033347bb4be9136c35605a.tar.bz2 | |
Fix a typo from the 8.0 -> 8.1 conversion of the Menu code.
| -rw-r--r-- | mac/tkMacMenu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mac/tkMacMenu.c b/mac/tkMacMenu.c index 4a0ab36..4e1693f 100644 --- a/mac/tkMacMenu.c +++ b/mac/tkMacMenu.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: tkMacMenu.c,v 1.11 1999/08/05 06:19:52 jingham Exp $ + * RCS: @(#) $Id: tkMacMenu.c,v 1.12 1999/08/07 18:54:37 jingham Exp $ */ #include "tkMacInt.h" @@ -3574,6 +3574,7 @@ TkpDrawMenuEntry( Tk_FontMetrics entryMetrics; int adjustedY = y + padY; int adjustedHeight = height - 2 * padY; + int state; /* * Choose the gc for drawing the foreground part of the entry. @@ -3604,7 +3605,7 @@ TkpDrawMenuEntry( } } - if (((parentDisabled || (mePtr->state == ENTRY_DISABLED))) + if (((parentDisabled || (state == ENTRY_DISABLED))) && (menuPtr->disabledFgPtr != NULL)) { gc = mePtr->disabledGC; if (gc == NULL) { |