diff options
| author | Jason Rumney | 2006-03-12 16:29:25 +0000 |
|---|---|---|
| committer | Jason Rumney | 2006-03-12 16:29:25 +0000 |
| commit | e7b14860d5e37f22e1ed3907cb2223367db45f8c (patch) | |
| tree | bc1842f7f2bdcbfe6bac64193e7dc703493b5808 | |
| parent | ab68b375c71ef86a7e90640e7f12a20185526cc1 (diff) | |
| download | emacs-e7b14860d5e37f22e1ed3907cb2223367db45f8c.tar.gz emacs-e7b14860d5e37f22e1ed3907cb2223367db45f8c.zip | |
(Fx_popup_menu): Call w32_free_menu_strings when
finished with the menu.
| -rw-r--r-- | src/w32menu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 57db01ac9e9..389e6c5b856 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -819,8 +819,10 @@ cached information about equivalent key sequences. */) | |||
| 819 | } | 819 | } |
| 820 | 820 | ||
| 821 | #ifdef HAVE_MENUS | 821 | #ifdef HAVE_MENUS |
| 822 | /* If resources from a previous popup menu exist yet, does nothing | 822 | /* If resources from a previous popup menu still exist, does nothing |
| 823 | until the `menu_free_timer' has freed them (see w32fns.c). | 823 | until the `menu_free_timer' has freed them (see w32fns.c). This |
| 824 | can occur if you press ESC or click outside a menu without selecting | ||
| 825 | a menu item. | ||
| 824 | */ | 826 | */ |
| 825 | if (current_popup_menu) | 827 | if (current_popup_menu) |
| 826 | { | 828 | { |
| @@ -837,6 +839,8 @@ cached information about equivalent key sequences. */) | |||
| 837 | UNBLOCK_INPUT; | 839 | UNBLOCK_INPUT; |
| 838 | 840 | ||
| 839 | discard_menu_items (); | 841 | discard_menu_items (); |
| 842 | w32_free_menu_strings (FRAME_W32_WINDOW (f)); | ||
| 843 | |||
| 840 | #endif /* HAVE_MENUS */ | 844 | #endif /* HAVE_MENUS */ |
| 841 | 845 | ||
| 842 | UNGCPRO; | 846 | UNGCPRO; |