aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann1999-10-06 23:13:21 +0000
committerGerd Moellmann1999-10-06 23:13:21 +0000
commitac44152803324a96100bb39ea1179e90091fbaf5 (patch)
tree0ad856a4b79744c93a0adceab2287f2ebcd0b491 /src
parentc7ae32842a6f9921d9aefd99480b6076e7d87484 (diff)
downloademacs-ac44152803324a96100bb39ea1179e90091fbaf5.tar.gz
emacs-ac44152803324a96100bb39ea1179e90091fbaf5.zip
(set_frame_menubar, xmenu_show): Call
x_set_menu_resources_from_menu_face.
Diffstat (limited to 'src')
-rw-r--r--src/xmenu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index a5b6e240f4e..fde77cad82d 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1545,7 +1545,6 @@ update_frame_menubar (f)
1545 1545
1546 /* Force the pane widget to resize itself with the right values. */ 1546 /* Force the pane widget to resize itself with the right values. */
1547 EmacsFrameSetCharSize (x->edit_widget, columns, rows); 1547 EmacsFrameSetCharSize (x->edit_widget, columns, rows);
1548
1549 UNBLOCK_INPUT; 1548 UNBLOCK_INPUT;
1550} 1549}
1551 1550
@@ -1789,8 +1788,8 @@ set_frame_menubar (f, first_time, deep_p)
1789 f->output_data.x->menubar_height = menubar_size; 1788 f->output_data.x->menubar_height = menubar_size;
1790 } 1789 }
1791 1790
1791 x_set_menu_resources_from_menu_face (f, f->output_data.x->menubar_widget);
1792 free_menubar_widget_value_tree (first_wv); 1792 free_menubar_widget_value_tree (first_wv);
1793
1794 update_frame_menubar (f); 1793 update_frame_menubar (f);
1795 1794
1796 UNBLOCK_INPUT; 1795 UNBLOCK_INPUT;
@@ -2135,6 +2134,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
2135 2134
2136 /* Display the menu. */ 2135 /* Display the menu. */
2137 lw_popup_menu (menu, &dummy); 2136 lw_popup_menu (menu, &dummy);
2137 x_set_menu_resources_from_menu_face (f, menu);
2138 popup_activated_flag = 1; 2138 popup_activated_flag = 1;
2139 2139
2140 /* Process events that apply to the menu. */ 2140 /* Process events that apply to the menu. */