Mercurial > emacs

changeset 6605:f5b781f33789

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set_frame_menubar): New arg, first_time. Don't update the menubar the first time it is created via x_window. (initialize_frame_menubar): Pass 1 to set_frame_menubar.
author Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
date Thu, 31 Mar 1994 14:50:46 +0000
parents bb11213734d6
children c0a3d01237ed
files src/xmenu.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/xmenu.c	Thu Mar 31 14:49:42 1994 +0000
+++ b/src/xmenu.c	Thu Mar 31 14:50:46 1994 +0000
@@ -1145,8 +1145,9 @@
 }
 
 void
-set_frame_menubar (f)
+set_frame_menubar (f, first_time)
      FRAME_PTR f;
+     int first_time;
 {
   Widget menubar_widget = f->display.x->menubar_widget;
   int id = (int) f;
@@ -1203,7 +1204,9 @@
   
   free_menubar_widget_value_tree (first_wv);
 
-  update_frame_menubar (f);
+  /* Don't update the menubar the first time it is created via x_window.  */
+  if (!first_time)
+    update_frame_menubar (f);
 
   UNBLOCK_INPUT;
 }
@@ -1233,7 +1236,7 @@
 initialize_frame_menubar (f)
      FRAME_PTR f;
 {
-  set_frame_menubar (f);
+  set_frame_menubar (f, 1);
 }
 
 /* Nonzero if position X, Y relative to inside of frame F