aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32menu.c
diff options
context:
space:
mode:
authorStefan Kangas2021-01-30 15:59:13 +0100
committerStefan Kangas2021-01-30 15:59:13 +0100
commit3555657585bb2c1809fa6abff7f565a8c7f226eb (patch)
treed09e3782c549b2f97bf46e4d9a05cc49f733f31c /src/w32menu.c
parent96f20120c97a0a329fff81a0cc3747082a8a2c55 (diff)
downloademacs-3555657585bb2c1809fa6abff7f565a8c7f226eb.tar.gz
emacs-3555657585bb2c1809fa6abff7f565a8c7f226eb.zip
Remove unused argument from set_frame_menubar (Bug#45759)
* src/w32menu.c (set_frame_menubar): * src/xmenu.c (set_frame_menubar): Remove unused argument. All callers updated.
Diffstat (limited to 'src/w32menu.c')
-rw-r--r--src/w32menu.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/w32menu.c b/src/w32menu.c
index 8bf0c462030..3bf76663947 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -155,7 +155,7 @@ w32_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
155void 155void
156w32_activate_menubar (struct frame *f) 156w32_activate_menubar (struct frame *f)
157{ 157{
158 set_frame_menubar (f, false, true); 158 set_frame_menubar (f, true);
159 159
160 /* Lock out further menubar changes while active. */ 160 /* Lock out further menubar changes while active. */
161 f->output_data.w32->menubar_active = 1; 161 f->output_data.w32->menubar_active = 1;
@@ -258,12 +258,10 @@ menubar_selection_callback (struct frame *f, void * client_data)
258} 258}
259 259
260 260
261/* Set the contents of the menubar widgets of frame F. 261/* Set the contents of the menubar widgets of frame F. */
262 The argument FIRST_TIME is currently ignored;
263 it is set the first time this is called, from initialize_frame_menubar. */
264 262
265void 263void
266set_frame_menubar (struct frame *f, bool first_time, bool deep_p) 264set_frame_menubar (struct frame *f, bool deep_p)
267{ 265{
268 HMENU menubar_widget = f->output_data.w32->menubar_widget; 266 HMENU menubar_widget = f->output_data.w32->menubar_widget;
269 Lisp_Object items; 267 Lisp_Object items;
@@ -511,7 +509,7 @@ initialize_frame_menubar (struct frame *f)
511 /* This function is called before the first chance to redisplay 509 /* This function is called before the first chance to redisplay
512 the frame. It has to be, so the frame will have the right size. */ 510 the frame. It has to be, so the frame will have the right size. */
513 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); 511 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
514 set_frame_menubar (f, true, true); 512 set_frame_menubar (f, true);
515} 513}
516 514
517/* Get rid of the menu bar of frame F, and free its storage. 515/* Get rid of the menu bar of frame F, and free its storage.