From a83599031abddc80e667369e6884788141cdab4d Mon Sep 17 00:00:00 2001 From: das Date: Sat, 2 Jun 2007 06:44:44 +0000 Subject: * macosx/tkMacOSXMenu.c (TkpPostMenu): ensure cascade menus display in posted menus that are not part of the menubar or attached to a menubutton (fixes bug reported on tcl-mac by Linux Nyberg). --- ChangeLog | 8 +++++++- macosx/tkMacOSXMenu.c | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec732bc..ac9569f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-06-02 Daniel Steffen + + * macosx/tkMacOSXMenu.c (TkpPostMenu): ensure cascade menus display in + posted menus that are not part of the menubar or attached to a + menubutton (fixes bug reported on tcl-mac by Linux Nyberg). + 2007-05-31 Daniel Steffen * macosx/tkMacOSXWindowEvent.c (GenerateUpdateEvent): complete all @@ -10,7 +16,7 @@ * macosx/tkMacOSXWm.c: BoundsChanged carbon event handler; correct/add window invalidation after window attribute changes. - * macosx/tkMacOSXSubwindows.c (XResizeWindow, XMoveResizeWindow, + * macosx/tkMacOSXSubwindows.c (XResizeWindow, XMoveResizeWindow) (XMoveWindow): factor out common code dealing with embedded and non-toplevel windows; remove unnecessary clip and window invalidation. diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index da7ce64..05fa7b4 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.38 2007/05/30 06:35:55 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.39 2007/06/02 06:44:44 das Exp $ */ #include "tkMacOSXInt.h" @@ -1556,6 +1556,7 @@ TkpPostMenu( Tcl_CancelIdleCall(DrawMenuBarWhenIdle, NULL); DrawMenuBarWhenIdle(NULL); } + RecursivelyInsertMenu(menuPtr); TkMacOSXTrackingLoop(1); popUpResult = PopUpMenuSelect(macMenuHdl, y, x, menuPtr->active); -- cgit v0.12