HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
90816b8
)
* w32menu.c (Fx_popup_menu): Don't free menu strings here.
author
Jason Rumney
<jasonr@gnu.org>
Thu, 22 Feb 2007 23:15:08 +0000
(23:15 +0000)
committer
Jason Rumney
<jasonr@gnu.org>
Thu, 22 Feb 2007 23:15:08 +0000
(23:15 +0000)
(w32_menu_show): Do it here instead.
src/w32menu.c
patch
|
blob
|
blame
|
history
diff --git
a/src/w32menu.c
b/src/w32menu.c
index
b977b90
..
a0aef4b
100644
(file)
--- 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)