diff options
| author | Jason Rumney <jasonr@gnu.org> | 2007-02-22 23:15:08 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2007-02-22 23:15:08 +0000 |
| commit | 563cd4c00818b4f1ec03ecdeba468c55ef32b89c (patch) | |
| tree | 5182d4ab7aac2d353ed5c0bd3da66141035346ad /src/w32menu.c | |
| parent | 90816b8607e4864bbab37ce14e33dca8e0f94246 (diff) | |
| download | emacs-563cd4c00818b4f1ec03ecdeba468c55ef32b89c.tar.gz | |
* w32menu.c (Fx_popup_menu): Don't free menu strings here.
(w32_menu_show): Do it here instead.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index b977b90e52d..a0aef4b58dd 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -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) |