[Emacs-diffs] Changes to emacs/src/w32menu.c

[Jason Rumney]

Index: emacs/src/w32menu.c
diff -c emacs/src/w32menu.c:1.54 emacs/src/w32menu.c:1.55
*** emacs/src/w32menu.c:1.54    Tue Jan  8 14:33:24 2002
--- emacs/src/w32menu.c Fri Feb 22 19:01:34 2002
***************
*** 159,164 ****
--- 159,165 ----
  static void single_menu_item ();
  static void list_of_panes ();
  static void list_of_items ();
+ void w32_free_menu_strings (HWND);
  
  /* This holds a Lisp vector that holds the results of decoding
     the keymaps or alist-of-alists that specify a menu.
***************
*** 1035,1045 ****
--- 1036,1054 ----
              buf.arg = entry;
              kbd_buffer_store_event (&buf);
  
+             /* Free memory used by owner-drawn and help-echo strings.  */
+             w32_free_menu_strings (FRAME_W32_WINDOW (f));
+             f->output_data.w32->menu_command_in_progress = 0;
+             f->output_data.w32->menubar_active = 0;
              return;
            }
          i += MENU_ITEMS_ITEM_LENGTH;
        }
      }
+   /* Free memory used by owner-drawn and help-echo strings.  */
+   w32_free_menu_strings (FRAME_W32_WINDOW (f));
+   f->output_data.w32->menu_command_in_progress = 0;
+   f->output_data.w32->menubar_active = 0;
  }
  
  /* Allocate a widget_value, blocking input.  */