diff options
| author | hobbs <hobbs> | 2009-09-14 23:39:52 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2009-09-14 23:39:52 (GMT) |
| commit | 3b477ae238ab3658f78fe41c4e227ea3c28cb2f7 (patch) | |
| tree | 8330aec7168a2742b5ccb9ff774da9e8eff021e5 /generic | |
| parent | feb78ea8619424dc09c994e0f89545246e6e18de (diff) | |
| download | tk-3b477ae238ab3658f78fe41c4e227ea3c28cb2f7.zip tk-3b477ae238ab3658f78fe41c4e227ea3c28cb2f7.tar.gz tk-3b477ae238ab3658f78fe41c4e227ea3c28cb2f7.tar.bz2 | |
* generic/tkMenuDraw.c (TkPostSubmenu): Fix reposting of submenu in
* win/tkWinMenu.c (TkWinHandleMenuEvent): torn off Windows menu.
[Bug 873613]
(DrawMenuEntryArrow): Draw Win menu arrow after being torn
off. [Bug 873608]
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkMenuDraw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c index 2df7a6d..607328c 100644 --- a/generic/tkMenuDraw.c +++ b/generic/tkMenuDraw.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: tkMenuDraw.c,v 1.3.20.2 2003/11/12 00:04:53 hobbs Exp $ + * RCS: @(#) $Id: tkMenuDraw.c,v 1.3.20.3 2009/09/14 23:39:52 hobbs Exp $ */ #include "tkMenu.h" @@ -1009,11 +1009,12 @@ TkPostSubmenu(interp, menuPtr, mePtr) name = Tcl_GetStringFromObj(mePtr->namePtr, NULL); Tk_GetRootCoords(menuPtr->tkwin, &x, &y); AdjustMenuCoords(menuPtr, mePtr, &x, &y, string); + menuPtr->postedCascade = mePtr; result = Tcl_VarEval(interp, "{", name, "} post ", string, (char *) NULL); if (result != TCL_OK) { + menuPtr->postedCascade = NULL; return result; } - menuPtr->postedCascade = mePtr; TkEventuallyRedrawMenu(menuPtr, mePtr); } return TCL_OK; |