diff options
| author | chengyemao <chengyemao> | 2005-01-17 07:00:11 (GMT) |
|---|---|---|
| committer | chengyemao <chengyemao> | 2005-01-17 07:00:11 (GMT) |
| commit | 34c66cf0c6bfb04c9222a5a0ac770a67ee457966 (patch) | |
| tree | af1f5a9ab323a7f62858d42e1b07fd78de995233 | |
| parent | 755a33fa24ee2e9c505c528c743441fb070e6259 (diff) | |
| download | tk-34c66cf0c6bfb04c9222a5a0ac770a67ee457966.zip tk-34c66cf0c6bfb04c9222a5a0ac770a67ee457966.tar.gz tk-34c66cf0c6bfb04c9222a5a0ac770a67ee457966.tar.bz2 | |
minor bug fix: should return 0 and indicate handled after processing WM_MENUSELECT message
| -rw-r--r-- | win/tkWinMenu.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 9f922ca..ef881e0 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.41 2005/01/13 01:48:03 chengyemao Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.42 2005/01/17 07:00:11 chengyemao Exp $ */ #define OEMRESOURCE @@ -1096,9 +1096,9 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) Tcl_BackgroundError(interp); } Tcl_Release((ClientData)interp); + *plResult = 0; + returnResult = 1; } - *plResult = 0; - returnResult = 1; break; } @@ -1210,9 +1210,9 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) - itemPtr->rcItem.top, 0, drawArrow); ckfree((char *) twdPtr); - *plResult = 1; - returnResult = 1; } + *plResult = 1; + returnResult = 1; break; } @@ -1262,6 +1262,8 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) } MenuSelectEvent(menuPtr); Tcl_ServiceAll(); + *plResult = 0; + returnResult = 1; } } break; |