summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--macosx/tkMacOSXMenu.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ab988c..610677a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-02 Daniel Steffen <das@users.sourceforge.net>
+
+ * 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 Linus Nyberg).
+
2007-05-31 Daniel Steffen <das@users.sourceforge.net>
* macosx/tkMacOSXWindowEvent.c (GenerateUpdateEvent): complete all
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 5728d9e..0d51ad3 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.6.2.25 2007/05/30 06:39:38 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.26 2007/06/02 06:46:49 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);