diff options
| author | fvogel <fvogelnew1@free.fr> | 2015-11-08 20:54:16 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2015-11-08 20:54:16 (GMT) |
| commit | 73b89417809cc91f33a1a6c9679510b21129db52 (patch) | |
| tree | 3c47999b22defcaefabb3c32718df5fea64b94b7 /generic/tkMenu.c | |
| parent | dc5e0089024a6f532879a8c22014223925b8f37d (diff) | |
| parent | 2028daf50bcb641a8be43c4989a37074d5a00f72 (diff) | |
| download | tk-73b89417809cc91f33a1a6c9679510b21129db52.zip tk-73b89417809cc91f33a1a6c9679510b21129db52.tar.gz tk-73b89417809cc91f33a1a6c9679510b21129db52.tar.bz2 | |
Fixed [2160206fff] - Panic when posting a menu of type menubar
Diffstat (limited to 'generic/tkMenu.c')
| -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 354d329..d24516f 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -885,9 +885,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); |