changeset 76080:077c9ec8eca6

* w32menu.c (Fx_popup_menu): Don't free menu strings here. (w32_menu_show): Do it here instead.
author Jason Rumney <jasonr@gnu.org>
date Thu, 22 Feb 2007 23:15:08 +0000
parents 27d8a3520956
children f5c05d67324f
files src/w32menu.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32menu.c	Thu Feb 22 23:04:34 2007 +0000
+++ b/src/w32menu.c	Thu Feb 22 23:15:08 2007 +0000
@@ -835,7 +835,6 @@
   UNBLOCK_INPUT;
 
   discard_menu_items ();
-  w32_free_menu_strings (FRAME_W32_WINDOW (f));
 
 #endif /* HAVE_MENUS */
 
@@ -1936,6 +1935,9 @@
 
   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)