diff options
| author | dgp@users.sourceforge.net <dgp> | 2014-08-14 16:38:33 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2014-08-14 16:38:33 (GMT) |
| commit | 7f92d438879fab2150ac2d1338eb47ed6c6fee7e (patch) | |
| tree | 426d258be68bda92bb901ec632fced87150c1a8b | |
| parent | 0096c71dbcf45201a98c297aed0464f112facf10 (diff) | |
| parent | 06b7a5736c5eab08bed8e4283b0364cff3fbee7a (diff) | |
| download | tk-7f92d438879fab2150ac2d1338eb47ed6c6fee7e.zip tk-7f92d438879fab2150ac2d1338eb47ed6c6fee7e.tar.gz tk-7f92d438879fab2150ac2d1338eb47ed6c6fee7e.tar.bz2 | |
merge 8.5
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 380d3a7..e1cdc76 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -757,11 +757,19 @@ TkpPostMenu( * to be posted. */ int y) /* The global y-coordinate */ { - NSWindow *win = [NSApp keyWindow]; - if (!win) { + + + /* Get the object that holds this Tk Window.*/ + Tk_Window root; + root = Tk_MainWindow(interp); + if (root == NULL) { return TCL_ERROR; } - + + Drawable d = Tk_WindowId(root); + NSView *rootview = TkMacOSXGetRootControl(d); + NSWindow *win = [rootview window]; + inPostMenu = 1; int oldMode = Tcl_SetServiceMode(TCL_SERVICE_NONE); |