X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/36cf8493aff99b652b2ad8c9e4d55a18688e8484..d703a4dce564ede122f5c307889e4bd0e3f3e75c:/src/w32menu.c

diff --git a/src/w32menu.c b/src/w32menu.c
index 6276c840fc..7a946d2dc7 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1,5 +1,5 @@
 /* Menu support for GNU Emacs on the Microsoft Windows API.
-   Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2014 Free
+   Copyright (C) 1986, 1988, 1993-1994, 1996, 1998-1999, 2001-2015 Free
    Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -98,8 +98,6 @@ AppendMenuW_Proc unicode_append_menu = NULL;
 MessageBoxW_Proc unicode_message_box = NULL;
 #endif /* NTGUI_UNICODE */
 
-Lisp_Object Qdebug_on_next_call, Qunsupported__w32_dialog;
-
 void set_frame_menubar (struct frame *, bool, bool);
 
 #ifdef HAVE_DIALOGS
@@ -503,7 +501,8 @@ set_frame_menubar (struct frame *f, bool first_time, bool deep_p)
     /* Force the window size to be recomputed so that the frame's text
        area remains the same, if menubar has just been created.  */
     if (old_widget == NULL)
-      x_set_window_size (f, 0, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 1);
+      adjust_frame_size (f, FRAME_TEXT_WIDTH (f),
+			 FRAME_TEXT_HEIGHT (f), 2, 0, Qmenu_bar_lines);
   }
 
   unblock_input ();
@@ -1255,9 +1254,9 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item)
       if (wv->key != NULL)
 	{
 	  out_string = SAFE_ALLOCA (strlen (wv->name) + strlen (wv->key) + 2);
-	  strcpy (out_string, wv->name);
-	  strcat (out_string, "\t");
-	  strcat (out_string, wv->key);
+	  p = stpcpy (out_string, wv->name);
+	  p = stpcpy (p, "\t");
+	  strcpy (p, wv->key);
 	}
       else
 	out_string = (char *)wv->name;