mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-24 13:57:36 +00:00
* w32menu.c (Fx_popup_menu): Don't free menu strings here.
(w32_menu_show): Do it here instead.
This commit is contained in:
parent
90816b8607
commit
563cd4c008
1 changed files with 3 additions and 1 deletions
|
|
@ -835,7 +835,6 @@ cached information about equivalent key sequences. */)
|
|||
UNBLOCK_INPUT;
|
||||
|
||||
discard_menu_items ();
|
||||
w32_free_menu_strings (FRAME_W32_WINDOW (f));
|
||||
|
||||
#endif /* HAVE_MENUS */
|
||||
|
||||
|
|
@ -1936,6 +1935,9 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
|
|||
|
||||
DestroyMenu (menu);
|
||||
|
||||
/* Free the owner-drawn and help-echo menu strings. */
|
||||
w32_free_menu_strings (FRAME_W32_WINDOW (f));
|
||||
|
||||
/* Find the selected item, and its pane, to return
|
||||
the proper value. */
|
||||
if (menu_item_selection != 0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue