Mercurial > emacs
changeset 36938:010e601743d5
(update_frame_menubar, set_frame_menubar, xmenu_show):
Remove calls to x_set_menu_resources_from_menu_face.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Thu, 22 Mar 2001 18:34:24 +0000 |
parents | af1f50d06d19 |
children | 1687dcb12ac7 |
files | src/xmenu.c |
diffstat | 1 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmenu.c Thu Mar 22 18:33:57 2001 +0000 +++ b/src/xmenu.c Thu Mar 22 18:34:24 2001 +0000 @@ -1583,7 +1583,6 @@ /* Re-manage the text-area widget, and then thrash the sizes. */ XtManageChild (x->edit_widget); - x_set_menu_resources_from_menu_face (f, x->menubar_widget); lw_refigure_widget (x->column_widget, True); /* Force the pane widget to resize itself with the right values. */ @@ -1835,8 +1834,7 @@ } free_menubar_widget_value_tree (first_wv); - if (!update_frame_menubar (f)) - x_set_menu_resources_from_menu_face (f, menubar_widget); + update_frame_menubar (f); UNBLOCK_INPUT; } @@ -2176,9 +2174,6 @@ /* Free the widget_value objects we used to specify the contents. */ free_menubar_widget_value_tree (first_wv); - /* Override any default settings with ones from the `menu' face. */ - x_set_menu_resources_from_menu_face (f, menu); - /* No selection has been chosen yet. */ menu_item_selection = 0;