diff options
| author | Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> | 1994-03-31 14:50:46 +0000 |
|---|---|---|
| committer | Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> | 1994-03-31 14:50:46 +0000 |
| commit | 706aa2f2e7d574ace98f141809c4f6af06377246 (patch) | |
| tree | ac1b1a746a517c09228ad43223395516d166deea /src | |
| parent | a7f7d5508cc8fdcacfc8dd4493af5d7694f226e8 (diff) | |
| download | emacs-706aa2f2e7d574ace98f141809c4f6af06377246.tar.gz | |
(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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmenu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 1d0a400c28c..9ce7335fbba 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1145,8 +1145,9 @@ update_frame_menubar (f) } 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 @@ set_frame_menubar (f) 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 @@ void 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 |