diff options
| author | chengyemao <chengyemao@noemail.net> | 2005-01-09 06:59:20 (GMT) |
|---|---|---|
| committer | chengyemao <chengyemao@noemail.net> | 2005-01-09 06:59:20 (GMT) |
| commit | afb72e9520b8534100f9bd4c704431733f8cd1fd (patch) | |
| tree | c7262b658ce973b57395ac93be237c5eea8c2317 /win/tkWinMenu.c | |
| parent | b41f8ec85b64a80ead37e96420eee1ca7f2a561d (diff) | |
| download | tk-afb72e9520b8534100f9bd4c704431733f8cd1fd.zip tk-afb72e9520b8534100f9bd4c704431733f8cd1fd.tar.gz tk-afb72e9520b8534100f9bd4c704431733f8cd1fd.tar.bz2 | |
bug fix [637653]
FossilOrigin-Name: 30b3719bac02b3c3a0b527622d6380fa5a23f0ea
Diffstat (limited to 'win/tkWinMenu.c')
| -rw-r--r-- | win/tkWinMenu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 425e8e9..d7f5d48 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.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: tkWinMenu.c,v 1.39 2005/01/09 00:26:59 chengyemao Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.40 2005/01/09 06:59:20 chengyemao Exp $ */ #define OEMRESOURCE @@ -1142,7 +1142,7 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) case WM_MEASUREITEM: { LPMEASUREITEMSTRUCT itemPtr = (LPMEASUREITEMSTRUCT) *plParam; - if (itemPtr != NULL) { + if (itemPtr != NULL && tsdPtr->modalMenuPtr != NULL) { mePtr = (TkMenuEntry *) itemPtr->itemData; menuPtr = mePtr->menuPtr; @@ -1171,7 +1171,7 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) Tk_FontMetrics fontMetrics; int drawArrow = 0; - if (itemPtr != NULL) { + if (itemPtr != NULL && tsdPtr->modalMenuPtr != NULL) { Tk_Font tkfont; mePtr = (TkMenuEntry *) itemPtr->itemData; |