summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2007-06-02 06:44:44 (GMT)
committerdas <das>2007-06-02 06:44:44 (GMT)
commita83599031abddc80e667369e6884788141cdab4d (patch)
tree23f9f5624cb43c6339c86857ba4c710de66d4675
parent416b6d1e00f7e93f67193db51b542628fd2e569b (diff)
downloadtk-a83599031abddc80e667369e6884788141cdab4d.zip
tk-a83599031abddc80e667369e6884788141cdab4d.tar.gz
tk-a83599031abddc80e667369e6884788141cdab4d.tar.bz2
* 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).
-rw-r--r--ChangeLog8
-rw-r--r--macosx/tkMacOSXMenu.c3
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 <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 Linux Nyberg).
+
2007-05-31 Daniel Steffen <das@users.sourceforge.net>
* 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);