Mercurial > emacs
comparison src/w32menu.c @ 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 | 5978a80d504e |
children | da9b24e47b34 |
comparison
equal
deleted
inserted
replaced
76079:27d8a3520956 | 76080:077c9ec8eca6 |
---|---|
833 selection = w32_menu_show (f, xpos, ypos, for_click, | 833 selection = w32_menu_show (f, xpos, ypos, for_click, |
834 keymaps, title, &error_name); | 834 keymaps, title, &error_name); |
835 UNBLOCK_INPUT; | 835 UNBLOCK_INPUT; |
836 | 836 |
837 discard_menu_items (); | 837 discard_menu_items (); |
838 w32_free_menu_strings (FRAME_W32_WINDOW (f)); | |
839 | 838 |
840 #endif /* HAVE_MENUS */ | 839 #endif /* HAVE_MENUS */ |
841 | 840 |
842 UNGCPRO; | 841 UNGCPRO; |
843 | 842 |
1933 | 1932 |
1934 /* Free the widget_value objects we used to specify the contents. */ | 1933 /* Free the widget_value objects we used to specify the contents. */ |
1935 free_menubar_widget_value_tree (first_wv); | 1934 free_menubar_widget_value_tree (first_wv); |
1936 | 1935 |
1937 DestroyMenu (menu); | 1936 DestroyMenu (menu); |
1937 | |
1938 /* Free the owner-drawn and help-echo menu strings. */ | |
1939 w32_free_menu_strings (FRAME_W32_WINDOW (f)); | |
1938 | 1940 |
1939 /* Find the selected item, and its pane, to return | 1941 /* Find the selected item, and its pane, to return |
1940 the proper value. */ | 1942 the proper value. */ |
1941 if (menu_item_selection != 0) | 1943 if (menu_item_selection != 0) |
1942 { | 1944 { |