diff options
| author | fvogel <fvogelnew1@free.fr> | 2015-11-08 20:50:24 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2015-11-08 20:50:24 (GMT) |
| commit | 2028daf50bcb641a8be43c4989a37074d5a00f72 (patch) | |
| tree | 48d4dad3ca5c0e6207d8dd378de1409ca4d1942f /generic | |
| parent | 509e52d9d0542fdf3883f95edf264045eba9ba5a (diff) | |
| parent | 2fb7c126ab1a68f237aee91ecd26b5f2eb6e074d (diff) | |
| download | tk-2028daf50bcb641a8be43c4989a37074d5a00f72.zip tk-2028daf50bcb641a8be43c4989a37074d5a00f72.tar.gz tk-2028daf50bcb641a8be43c4989a37074d5a00f72.tar.bz2 | |
Fixed [2160206fff] - Panic when posting a menu of type menubar
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkMenu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index 49b5935..b35be24 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -934,9 +934,14 @@ MenuWidgetObjCmd( * Tearoff menus are posted differently on Mac and Windows than * non-tearoffs. TkpPostMenu does not actually map the menu's window * on those platforms, and popup menus have to be handled specially. + * Also, menubar menues are not intended to be posted (bug 1567681, + * 2160206). */ - if (menuPtr->menuType != TEAROFF_MENU) { + if (menuPtr->menuType == MENUBAR) { + Tcl_AppendResult(interp, "a menubar menu cannot be posted", NULL); + return TCL_ERROR; + } else if (menuPtr->menuType != TEAROFF_MENU) { result = TkpPostMenu(interp, menuPtr, x, y); } else { result = TkPostTearoffMenu(interp, menuPtr, x, y); |