7 files changed, 311 insertions, 107 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d49514b2fc0..14eece1b04e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,48 @@
+2004-08-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * macmenu.c (_widget_value): Added lname and lkey.
+        (single_submenu): Set lname and lkey in widget_value
+        instead of name and key.
+        (update_submenu_strings): New function.
+        (set_frame_menubar): Remove call to inhibit_garbage_collection,
+        call update_submenu_strings.
+
+        * xmenu.c (digest_single_submenu): Set lname and lkey in widget_value
+        instead of name and key.
+        (update_submenu_strings): New function.
+        (set_frame_menubar): Remove call to inhibit_garbage_collection,
+        call update_submenu_strings.
+
+        * gtkutil.h (_widget_value): Added lname and lkey.
+
+2004-08-30  Steven Tamm  <steventamm@mac.com>
+
+        * macmenu.c (mac_menu_show): Remove shadowing of menu variable
+        by using different names for inner loop variables.
+
+2004-08-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
+        from 2002-07-15T00:01:34Z!raeburn@raeburn.org so that strings from ENCODE_UTF_8 isn't GC:ed before used.
+
+        * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
+        tool bar items is 0.
+
+2004-08-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte
+        strings in menu items.
+        (single_submenu): Use ENCODE_MENU_STRING
+        (mac_menu_show): Use ENCODE_MENU_STRING.  Reset grabbed because
+        button release isn't passed to event loop
+        (add_menu_item): Use SetMenuItemWithCFString
+
+2004-08-26  Steven Tamm  <steventamm@mac.com>
+
+        * fileio.c (Fread_file_name): Call x_file_dialog on carbon on
+        tool-bar/menu click
+        * macfns.c (Fx_file_dialog): Implemented using NavServices
+
 2004-08-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xterm.c (x_catch_errors_unwind): Do not XSync if display has closed.
diff --git a/src/fileio.c b/src/fileio.c
index da544f72234..707b6e96d86 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6306,7 +6306,7 @@ and `read-file-name-function'.  */)
 
   GCPRO2 (insdef, default_filename);
 
-#if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK)
+#if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK) || defined (TARGET_API_MAC_CARBON)
   if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
       && use_dialog_box
       && use_file_dialog
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 3ffba0ba745..fabdae74dc6 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -793,7 +793,7 @@ xg_create_frame_widgets (f)
      up in the wrong place as tool bar height has not been taken into account.
      So we cheat a bit by setting a height that is what it will have
      later on when tool bar items are added.  */
-  if (FRAME_EXTERNAL_TOOL_BAR (f) && FRAME_TOOLBAR_HEIGHT (f) == 0)
+  if (FRAME_EXTERNAL_TOOL_BAR (f) && f->n_tool_bar_items == 0)
     FRAME_TOOLBAR_HEIGHT (f) = 34;
 
 
diff --git a/src/gtkutil.h b/src/gtkutil.h
index b31ec8c2a1f..b35ab94b2cb 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -96,10 +96,12 @@ typedef struct xg_menu_item_cb_data_
 typedef struct _widget_value
 {
   /* name of widget */
+  Lisp_Object   lname;
   char          *name;
   /* value (meaning depend on widget type) */
   char          *value;
   /* keyboard equivalent. no implications for XtTranslations */
+  Lisp_Object   lkey;
   char          *key;
   /* Help string or nil if none.
      GC finds this string through the frame's menu_bar_vector
diff --git a/src/macfns.c b/src/macfns.c
index ec014e772e3..fbade05ea17 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -4192,19 +4192,27 @@ Value is t if tooltip was open, nil otherwise.  */)
 
 
 
+#ifdef TARGET_API_MAC_CARBON
 /***********************************************************************
                         File selection dialog
  ***********************************************************************/
 
-#if 0 /* MAC_TODO: can standard file dialog */
+/**
+   There is a relatively standard way to do this using applescript to run
+   a (choose file) method.  However, this doesn't do "the right thing"
+   by working only if the find-file occurred during a menu or toolbar
+   click.  So we must do the file dialog by hand, using the navigation
+   manager.  This also has more flexibility in determining the default
+   directory and whether or not we are going to choose a file.
+ **/
+
 extern Lisp_Object Qfile_name_history;
 
 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 4, 0,
        doc: /* Read file name, prompting with PROMPT in directory DIR.
 Use a file selection dialog.
 Select DEFAULT-FILENAME in the dialog's file selection box, if
-specified.  Don't let the user enter a file name in the file
-selection dialog's entry field, if MUSTMATCH is non-nil.  */)
+specified.  Ensure that file exists if MUSTMATCH is non-nil.  */)
   (prompt, dir, default_filename, mustmatch)
      Lisp_Object prompt, dir, default_filename, mustmatch;
 {
@@ -4212,9 +4220,8 @@ selection dialog's entry field, if MUSTMATCH is non-nil.  */)
   Lisp_Object file = Qnil;
   int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
-  char filename[MAX_PATH + 1];
-  char init_dir[MAX_PATH + 1];
-  int use_dialog_p = 1;
+  char filename[1001];
+  int default_filter_index = 1; /* 1: All Files, 2: Directories only  */
 
   GCPRO5 (prompt, dir, default_filename, mustmatch, file);
   CHECK_STRING (prompt);
@@ -4223,87 +4230,150 @@ selection dialog's entry field, if MUSTMATCH is non-nil.  */)
   /* Create the dialog with PROMPT as title, using DIR as initial
      directory and using "*" as pattern.  */
   dir = Fexpand_file_name (dir, Qnil);
-  strncpy (init_dir, SDATA (dir), MAX_PATH);
-  init_dir[MAX_PATH] = '\0';
-  unixtodos_filename (init_dir);
-
-  if (STRINGP (default_filename))
-    {
-      char *file_name_only;
-      char *full_path_name = SDATA (default_filename);
-
-      unixtodos_filename (full_path_name);
-
-      file_name_only = strrchr (full_path_name, '\\');
-      if (!file_name_only)
-        file_name_only = full_path_name;
-      else
-        {
-          file_name_only++;
-
-          /* If default_file_name is a directory, don't use the open
-             file dialog, as it does not support selecting
-             directories. */
-          if (!(*file_name_only))
-            use_dialog_p = 0;
-        }
-
-      strncpy (filename, file_name_only, MAX_PATH);
-      filename[MAX_PATH] = '\0';
-    }
-  else
-    filename[0] = '\0';
 
-  if (use_dialog_p)
-    {
-      OPENFILENAME file_details;
-      char *filename_file;
+  {
+    OSStatus status;
+    NavDialogCreationOptions options;
+    NavDialogRef dialogRef;
+    NavTypeListHandle fileTypes = NULL;
+    NavUserAction userAction;
+    CFStringRef message=NULL, client=NULL, saveName = NULL;
+    
+    /* No need for a callback function because we are modal */
+    NavGetDefaultDialogCreationOptions(&options);
+    options.modality = kWindowModalityAppModal;
+    options.location.h = options.location.v = -1;
+    options.optionFlags = kNavDefaultNavDlogOptions;
+    options.optionFlags |= kNavAllFilesInPopup;  /* All files allowed */
+    options.optionFlags |= kNavSelectAllReadableItem;
+    if (!NILP(prompt))
+      {
+        message = CFStringCreateWithCStringNoCopy(NULL, SDATA(prompt),
+                                                  kCFStringEncodingUTF8, 
+                                                  kCFAllocatorNull);
+        options.message = message;
+      }
+    /* Don't set the application, let it use default.
+    client = CFStringCreateWithCStringNoCopy(NULL, "Emacs", 
+                                             kCFStringEncodingMacRoman, NULL);
+    options.clientName = client;
+    */
+
+    /* Do Dired hack copied from w32fns.c */ 
+    if (!NILP(prompt) && strncmp (SDATA(prompt), "Dired", 5) == 0)
+      status = NavCreateChooseFolderDialog(&options, NULL, NULL, NULL,
+                                           &dialogRef);
+    else if (NILP (mustmatch)) 
+      { 
+        /* This is a save dialog */
+        if (!NILP(default_filename))
+          {
+            saveName = CFStringCreateWithCString(NULL, SDATA(default_filename),
+                                                 kCFStringEncodingUTF8);
+            options.saveFileName = saveName;
+            options.optionFlags |= kNavSelectDefaultLocation;
+          }
+        /* MAC_TODO: Find a better way to determine if this is a save
+           or load dialog than comparing dir with default_filename */
+        if (EQ(dir, default_filename)) 
+          {
+            status = NavCreateChooseFileDialog(&options, fileTypes,
+                                               NULL, NULL, NULL, NULL, 
+                                               &dialogRef);
+          }
+        else {
+          status = NavCreatePutFileDialog(&options, 
+                                          'TEXT', kNavGenericSignature,
+                                          NULL, NULL, &dialogRef);
+        }
+      }
+    else
+      {
+        /* This is an open dialog*/
+        status = NavCreateChooseFileDialog(&options, fileTypes,
+                                           NULL, NULL, NULL, NULL, 
+                                           &dialogRef);
+      }
+    
+    /* Set the default location and continue*/
+    if (status == noErr) {
+      if (!NILP(dir)) {
+        FSRef defLoc;
+        AEDesc defLocAed;
+        status = FSPathMakeRef(SDATA(dir), &defLoc, NULL);
+        if (status == noErr) 
+          {
+            AECreateDesc(typeFSRef, &defLoc, sizeof(FSRef), &defLocAed);
+            NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed);
+          }
+        AEDisposeDesc(&defLocAed);
+      }
 
-      /* Prevent redisplay.  */
-      specbind (Qinhibit_redisplay, Qt);
       BLOCK_INPUT;
+      status = NavDialogRun(dialogRef);
+      UNBLOCK_INPUT;
+    }
 
-      bzero (&file_details, sizeof (file_details));
-      file_details.lStructSize = sizeof (file_details);
-      file_details.hwndOwner = FRAME_W32_WINDOW (f);
-      file_details.lpstrFile = filename;
-      file_details.nMaxFile = sizeof (filename);
-      file_details.lpstrInitialDir = init_dir;
-      file_details.lpstrTitle = SDATA (prompt);
-      file_details.Flags = OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
-
-      if (!NILP (mustmatch))
-        file_details.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST;
+    if (saveName) CFRelease(saveName);
+    if (client) CFRelease(client);
+    if (message) CFRelease(message);
 
-      if (GetOpenFileName (&file_details))
-        {
-          dostounix_filename (filename);
-          file = build_string (filename);
-        }
-      else
-        file = Qnil;
-
-      UNBLOCK_INPUT;
-      file = unbind_to (count, file);
+    if (status == noErr) {
+      userAction = NavDialogGetUserAction(dialogRef);
+      switch (userAction)
+        {
+        case kNavUserActionNone:
+        case kNavUserActionCancel:
+          NavDialogDispose(dialogRef);
+          Fsignal (Qquit, Qnil);  /* Treat cancel like C-g */
+          return;
+        case kNavUserActionOpen:
+        case kNavUserActionChoose:
+        case kNavUserActionSaveAs:
+          {
+            NavReplyRecord reply;
+            AEDesc aed;
+            FSRef fsRef;
+            status = NavDialogGetReply(dialogRef, &reply);
+            AECoerceDesc(&reply.selection, typeFSRef, &aed);
+            AEGetDescData(&aed, (void *) &fsRef, sizeof (FSRef));
+            FSRefMakePath(&fsRef, (UInt8 *) filename, 1000);
+            AEDisposeDesc(&aed);
+            if (reply.saveFileName)
+              {
+                /* If it was a saved file, we need to add the file name */
+                int len = strlen(filename);
+                if (len && filename[len-1] != '/')
+                  filename[len++] = '/';
+                CFStringGetCString(reply.saveFileName, filename+len, 
+                                   1000-len, kCFStringEncodingUTF8);
+              }
+            file = DECODE_FILE(build_string (filename));
+            NavDisposeReply(&reply);
+          }
+          break;
+        }
+      NavDialogDispose(dialogRef);
     }
-  /* Open File dialog will not allow folders to be selected, so resort
-     to minibuffer completing reads for directories. */
-  else
-    file = Fcompleting_read (prompt, intern ("read-file-name-internal"),
-                             dir, mustmatch, dir, Qfile_name_history,
-                             default_filename, Qnil);
+    else {
+      /* Fall back on minibuffer if there was a problem */
+      file = Fcompleting_read (prompt, intern ("read-file-name-internal"),
+                               dir, mustmatch, dir, Qfile_name_history,
+                               default_filename, Qnil);
+    }
+  }
 
   UNGCPRO;
-
+  
   /* Make "Cancel" equivalent to C-g.  */
   if (NILP (file))
     Fsignal (Qquit, Qnil);
-
+  
   return unbind_to (count, file);
 }
-#endif /* MAC_TODO */
 
 
+#endif
 
 /***********************************************************************
                             Initialization
@@ -4507,7 +4577,7 @@ Chinese, Japanese, and Korean.  */);
   last_show_tip_args = Qnil;
   staticpro (&last_show_tip_args);
 
-#if 0 /* MAC_TODO */
+#if TARGET_API_MAC_CARBON
   defsubr (&Sx_file_dialog);
 #endif
 }
diff --git a/src/macmenu.c b/src/macmenu.c
index d205ee3b877..88012b01f73 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -90,10 +90,12 @@ enum button_type
 typedef struct _widget_value
 {
   /* name of widget */
+  Lisp_Object   lname;
   char*         name;
   /* value (meaning depend on widget type) */
   char*         value;
   /* keyboard equivalent. no implications for XtTranslations */
+  Lisp_Object   lkey;
   char*         key;
   /* Help string or nil if none.
      GC finds this string through the frame's menu_bar_vector
@@ -163,6 +165,12 @@ extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
 
 extern Lisp_Object Qmenu_bar_update_hook;
 
+#if TARGET_API_MAC_CARBON
+#define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str)
+#else
+#define ENCODE_MENU_STRING(str) ENCODE_SYSTEM (str)
+#endif
+
 void set_frame_menubar ();
 
 static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
@@ -1215,12 +1223,9 @@ single_submenu (item_key, item_name, maps)
                 save_wv->next = wv;
               else
                 first_wv->contents = wv;
-              wv->name = pane_string;
-              /* Ignore the @ that means "separate pane".
-                 This is a kludge, but this isn't worth more time.  */
-              if (!NILP (prefix) && wv->name[0] == '@')
-                wv->name++;
-              wv->value = 0;
+              wv->lname = pane_name;
+              /* Set value to 1 so update_submenu_strings can handle '@'  */
+              wv->value = (char *)1;
               wv->enabled = 1;
               wv->button_type = BUTTON_TYPE_NONE;
               wv->help = Qnil;
@@ -1246,13 +1251,13 @@ single_submenu (item_key, item_name, maps)
 #ifndef HAVE_MULTILINGUAL_MENU
           if (STRING_MULTIBYTE (item_name))
             {
-              item_name = ENCODE_SYSTEM (item_name);
+              item_name = ENCODE_MENU_STRING (item_name);
               AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;
             }
 
           if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
             {
-              descrip = ENCODE_SYSTEM (descrip);
+              descrip = ENCODE_MENU_STRING (descrip);
               AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;
             }
 #endif /* not HAVE_MULTILINGUAL_MENU */
@@ -1263,9 +1268,9 @@ single_submenu (item_key, item_name, maps)
           else
             save_wv->contents = wv;
 
-          wv->name = (char *) SDATA (item_name);
+          wv->lname = item_name;
           if (!NILP (descrip))
-            wv->key = (char *) SDATA (descrip);
+            wv->lkey = descrip;
           wv->value = 0;
           /* The EMACS_INT cast avoids a warning.  There's no problem
              as long as pointers have enough bits to hold small integers.  */
@@ -1304,6 +1309,41 @@ single_submenu (item_key, item_name, maps)
 
   return first_wv;
 }
+/* Walk through the widget_value tree starting at FIRST_WV and update
+   the char * pointers from the corresponding lisp values.
+   We do this after building the whole tree, since GC may happen while the
+   tree is constructed, and small strings are relocated.  So we must wait
+   until no GC can happen before storing pointers into lisp values.  */
+static void
+update_submenu_strings (first_wv)
+     widget_value *first_wv;
+{
+  widget_value *wv;
+
+  for (wv = first_wv; wv; wv = wv->next)
+    {
+      if (wv->lname && ! NILP (wv->lname))
+        {
+          wv->name = SDATA (wv->lname);
+
+          /* Ignore the @ that means "separate pane".
+             This is a kludge, but this isn't worth more time.  */
+          if (wv->value == (char *)1)
+            {
+              if (wv->name[0] == '@')
+                wv->name++;
+              wv->value = 0;
+            }
+        }
+
+      if (wv->lkey && ! NILP (wv->lkey))
+        wv->key = SDATA (wv->lkey);
+
+      if (wv->contents)
+        update_submenu_strings (wv->contents);
+    }
+}
+
 
 /* Set the contents of the menubar widgets of frame F.
    The argument FIRST_TIME is currently ignored;
@@ -1382,8 +1422,6 @@ set_frame_menubar (f, first_time, deep_p)
 
       items = FRAME_MENU_BAR_ITEMS (f);
 
-      inhibit_garbage_collection ();
-
       /* Save the frame's previous menu bar contents data.  */
       if (previous_menu_items_used)
         bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,
@@ -1448,6 +1486,7 @@ set_frame_menubar (f, first_time, deep_p)
           if (NILP (string))
             break;
           wv->name = (char *) SDATA (string);
+          update_submenu_strings (wv->contents);
           wv = wv->next;
         }
 
@@ -1705,12 +1744,12 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
 #ifndef HAVE_MULTILINGUAL_MENU
           if (STRINGP (item_name) && STRING_MULTIBYTE (item_name))
             {
-              item_name = ENCODE_SYSTEM (item_name);
+              item_name = ENCODE_MENU_STRING (item_name);
               AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;
             }
           if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
             {
-              descrip = ENCODE_SYSTEM (descrip);
+              descrip = ENCODE_MENU_STRING (descrip);
               AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;
             }
 #endif /* not HAVE_MULTILINGUAL_MENU */
@@ -1764,7 +1803,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
 
 #ifndef HAVE_MULTILINGUAL_MENU
       if (STRING_MULTIBYTE (title))
-        title = ENCODE_SYSTEM (title);
+        title = ENCODE_MENU_STRING (title);
 #endif
       wv_title->name = (char *) SDATA (title);
       wv_title->enabled = TRUE;
@@ -1801,9 +1840,9 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   /* Get the refcon to find the correct item*/
   if (menu_item_selection)
     {
-      menu = GetMenuHandle (HiWord (menu_item_choice));
-      if (menu) {
-        GetMenuItemRefCon (menu, menu_item_selection, &refcon);
+      MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));
+      if (sel_menu) {
+        GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);
       }
     }
 
@@ -1813,6 +1852,10 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   discard_mouse_events ();
 #endif
 
+  /* Must reset this manually because the button release event is not
+     passed to Emacs event loop. */
+  FRAME_MAC_DISPLAY_INFO (f)->grabbed = 0;
+
   /* Free the widget_value objects we used to specify the
      contents.  */
   free_menubar_widget_value_tree (first_wv);
@@ -1821,11 +1864,11 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   {
     int i = MIN_POPUP_SUBMENU_ID;
     MenuHandle submenu = GetMenuHandle (i);
-    while (menu != NULL)
+    while (submenu != NULL)
       {
         DeleteMenu (i);
-        DisposeMenu (menu);
-        menu = GetMenuHandle (++i);
+        DisposeMenu (submenu);
+        submenu = GetMenuHandle (++i);
       }
   }
 
@@ -2219,8 +2262,18 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
           strncat (item_name, wv->key, 255);
         }
       item_name[255] = 0;
+#if TARGET_API_MAC_CARBON
+      {
+        CFStringRef string =
+          CFStringCreateWithCString (NULL, item_name, kCFStringEncodingUTF8);
+
+        SetMenuItemTextWithCFString (menu, pos, string);
+        CFRelease (string);
+      }
+#else
       c2pstr (item_name);
       SetMenuItemText (menu, pos, item_name);
+#endif
 
       if (wv->enabled && !force_disable)
 #if TARGET_API_MAC_CARBON
diff --git a/src/xmenu.c b/src/xmenu.c
index 2ca6e247e12..aa963935262 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1701,12 +1701,9 @@ digest_single_submenu (start, end, top_level_items)
                 save_wv->next = wv;
               else
                 first_wv->contents = wv;
-              wv->name = pane_string;
-              /* Ignore the @ that means "separate pane".
-                 This is a kludge, but this isn't worth more time.  */
-              if (!NILP (prefix) && wv->name[0] == '@')
-                wv->name++;
-              wv->value = 0;
+              wv->lname = pane_name;
+              /* Set value to 1 so update_submenu_strings can handle '@'  */
+              wv->value = (char *)1;
               wv->enabled = 1;
               wv->button_type = BUTTON_TYPE_NONE;
               wv->help = Qnil;
@@ -1749,9 +1746,9 @@ digest_single_submenu (start, end, top_level_items)
           else
             save_wv->contents = wv;
 
-          wv->name = (char *) SDATA (item_name);
+          wv->lname = item_name;
           if (!NILP (descrip))
-            wv->key = (char *) SDATA (descrip);
+            wv->lkey = descrip;
           wv->value = 0;
           /* The EMACS_INT cast avoids a warning.  There's no problem
              as long as pointers have enough bits to hold small integers.  */
@@ -1790,6 +1787,42 @@ digest_single_submenu (start, end, top_level_items)
 
   return first_wv;
 }
+
+/* Walk through the widget_value tree starting at FIRST_WV and update
+   the char * pointers from the corresponding lisp values.
+   We do this after building the whole tree, since GC may happen while the
+   tree is constructed, and small strings are relocated.  So we must wait
+   until no GC can happen before storing pointers into lisp values.  */
+static void
+update_submenu_strings (first_wv)
+     widget_value *first_wv;
+{
+  widget_value *wv;
+
+  for (wv = first_wv; wv; wv = wv->next)
+    {
+      if (wv->lname && ! NILP (wv->lname))
+        {
+          wv->name = SDATA (wv->lname);
+
+          /* Ignore the @ that means "separate pane".
+             This is a kludge, but this isn't worth more time.  */
+          if (wv->value == (char *)1)
+            {
+              if (wv->name[0] == '@')
+                wv->name++;
+              wv->value = 0;
+            }
+        }
+
+      if (wv->lkey && ! NILP (wv->lkey))
+        wv->key = SDATA (wv->lkey);
+
+      if (wv->contents)
+        update_submenu_strings (wv->contents);
+    }
+}
+
 
 /* Recompute all the widgets of frame F, when the menu bar has been
    changed.  Value is non-zero if widgets were updated.  */
@@ -2022,9 +2055,10 @@ set_frame_menubar (f, first_time, deep_p)
           Lisp_Object string;
           string = XVECTOR (items)->contents[i + 1];
           if (NILP (string))
-            break;
-          wv->name = (char *) SDATA (string);
-          wv = wv->next;
+            break;
+          wv->name = (char *) SDATA (string);
+          update_submenu_strings (wv->contents);
+          wv = wv->next;
         }
 
       f->menu_bar_vector = menu_items;