diff options
| author | Jan Djärv | 2013-03-30 11:18:48 +0100 |
|---|---|---|
| committer | Jan Djärv | 2013-03-30 11:18:48 +0100 |
| commit | f38ab1671fe07823f8b416cd196d8044462f5ff2 (patch) | |
| tree | cd13a0280983c75c3459ca581d65af153df974d5 /src | |
| parent | 6d01f1feafdbcf90b4a602ed6ae4a3f543f5b8b9 (diff) | |
| download | emacs-f38ab1671fe07823f8b416cd196d8044462f5ff2.tar.gz emacs-f38ab1671fe07823f8b416cd196d8044462f5ff2.zip | |
* nsmenu.m (showAtX:Y:for:): setLevel to
NSPopUpMenuWindowLevel (Bug#13998).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsmenu.m | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9899f32fc4b..78b03477648 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-03-30 Darren Ho <darren.hoo@gmail.com> (tiny change). | ||
| 2 | * nsmenu.m (showAtX:Y:for:): setLevel to | ||
| 3 | NSPopUpMenuWindowLevel (Bug#13998). | ||
| 4 | |||
| 1 | 2013-03-30 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2013-03-30 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * nsterm.h (ns_get_pending_menu_title, ns_check_menu_open) | 7 | * nsterm.h (ns_get_pending_menu_title, ns_check_menu_open) |
diff --git a/src/nsmenu.m b/src/nsmenu.m index 02c5f9e6e5b..4e26a994b59 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -1328,6 +1328,7 @@ update_frame_tool_bar (FRAME_PTR f) | |||
| 1328 | wr.size = [textField frame].size; | 1328 | wr.size = [textField frame].size; |
| 1329 | 1329 | ||
| 1330 | [win setFrame: wr display: YES]; | 1330 | [win setFrame: wr display: YES]; |
| 1331 | [win setLevel: NSPopUpMenuWindowLevel]; | ||
| 1331 | [win orderFront: self]; | 1332 | [win orderFront: self]; |
| 1332 | [win display]; | 1333 | [win display]; |
| 1333 | timer = [NSTimer scheduledTimerWithTimeInterval: (float)seconds target: self | 1334 | timer = [NSTimer scheduledTimerWithTimeInterval: (float)seconds target: self |