(enum button_type, widget_value, local_heap, local_alloc):

(local_free, malloc_widget_value, free_widget_value):
(MENU_ITEMS_ITEM_NAME, MENU_ITEMS_ITEM_ENABLE, MENU_ITEMS_ITEM_VALUE):
(MENU_ITEMS_ITEM_EQUIV_KEY, MENU_ITEMS_ITEM_DEFINITION):
(MENU_ITEMS_ITEM_TYPE, MENU_ITEMS_ITEM_SELECTED, MENU_ITEMS_ITEM_HELP):
(MENU_ITEMS_ITEM_LENGTH, enum menu_item_idx): Remove defs.
(menu_items, menu_items_allocated, menu_items_used):
(menu_items_n_panes, menu_items_submenu_depth): Remove global vars.
(init_menu_items, finish_menu_items, discard_menu_items):
(grow_menu_items, push_submenu_start, push_submenu_end):
(push_left_right_boundary, push_menu_pane, push_menu_item,
(keymap_panes, single_keymap_panes, list_of_panes, list_of_items):
(free_menubar_widget_tree_value, parse_single_submenu):
(update_submenu_strings): Remove functions.
(xmalloc_widget_value): Remove and declare extern.

2 files changed, 33 insertions, 27 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9218f13193b..b0b036a821e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,36 @@
+2008-06-09  Jason Rumney  <jasonr@gnu.org>
+
+        Changes to w32 files related to the move of common menu code
+        to menu.c on 2008-06-08 by Chong Yidong.
+
+        * menu.c [HAVE_NTGUI]: Include w32term.h, move widget related
+        defs to w32gui.h.
+        (single_keymap_panes, push_menu_item, push_menu_pane): Make
+        globally visible.
+
+        * w32menu.c (enum button_type, widget_value, local_heap, local_alloc):
+        (local_free, malloc_widget_value, free_widget_value):
+        (MENU_ITEMS_ITEM_NAME, MENU_ITEMS_ITEM_ENABLE, MENU_ITEMS_ITEM_VALUE):
+        (MENU_ITEMS_ITEM_EQUIV_KEY, MENU_ITEMS_ITEM_DEFINITION):
+        (MENU_ITEMS_ITEM_TYPE, MENU_ITEMS_ITEM_SELECTED, MENU_ITEMS_ITEM_HELP):
+        (MENU_ITEMS_ITEM_LENGTH, enum menu_item_idx): Remove defs.
+        (menu_items, menu_items_allocated, menu_items_used):
+        (menu_items_n_panes, menu_items_submenu_depth): Remove global vars.
+        (init_menu_items, finish_menu_items, discard_menu_items):
+        (grow_menu_items, push_submenu_start, push_submenu_end):
+        (push_left_right_boundary, push_menu_pane, push_menu_item,
+        (keymap_panes, single_keymap_panes, list_of_panes, list_of_items):
+        (free_menubar_widget_tree_value, parse_single_submenu):
+        (update_submenu_strings): Remove functions.
+        (xmalloc_widget_value): Remove and declare extern.
+
+        * makefile.w32-in ($(SRC)/menu.$(O)): New target.
+        (OBJ1): Build it.
+
+        * w32gui.h (widget_value, XtPointer, Boolean, enum button_type):
+        (local_heap, local_alloc, local_free, malloc_widget_value):
+        (free_widget_value): Define here.
+
 2008-06-09  Kenichi Handa  <handa@m17n.org>
 
         * font.h (Qascii_0): Extern it.
diff --git a/src/w32menu.c b/src/w32menu.c
index a689d472e71..a2d87abc67a 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -620,33 +620,6 @@ menubar_selection_callback (FRAME_PTR f, void * client_data)
   f->output_data.w32->menubar_active = 0;
 }
 
-/* This recursively calls free_widget_value on the tree of widgets.
-   It must free all data that was malloc'ed for these widget_values.
-   In Emacs, many slots are pointers into the data of Lisp_Strings, and
-   must be left alone.  */
-
-void
-free_menubar_widget_value_tree (wv)
-     widget_value *wv;
-{
-  if (! wv) return;
-
-  wv->name = wv->value = wv->key = (char *) 0xDEADBEEF;
-
-  if (wv->contents && (wv->contents != (widget_value*)1))
-    {
-      free_menubar_widget_value_tree (wv->contents);
-      wv->contents = (widget_value *) 0xDEADBEEF;
-    }
-  if (wv->next)
-    {
-      free_menubar_widget_value_tree (wv->next);
-      wv->next = (widget_value *) 0xDEADBEEF;
-    }
-  BLOCK_INPUT;
-  free_widget_value (wv);
-  UNBLOCK_INPUT;
-}
 
 /* Set up data i menu_items for a menu bar item
    whose event type is ITEM_KEY (with string ITEM_NAME)