aboutsummaryrefslogtreecommitdiffstats
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-22 18:34:55 +0000
committerGerd Moellmann2001-03-22 18:34:55 +0000
commit364cd450426cc0f93eada8f00c30000ff2ba22f2 (patch)
treec8072d5d1ddeef0bd9aaed25f34d877276450974 /src/xmenu.c
parent7dc17ed0b784f141827a739b3da679b8535964ed (diff)
downloademacs-364cd450426cc0f93eada8f00c30000ff2ba22f2.tar.gz
emacs-364cd450426cc0f93eada8f00c30000ff2ba22f2.zip
(update_frame_menubar, set_frame_menubar, xmenu_show):
Remove calls to x_set_menu_resources_from_menu_face.
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index de74d6b1645..7e7cf2ab71b 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1583,7 +1583,6 @@ update_frame_menubar (f)
1583 1583
1584 /* Re-manage the text-area widget, and then thrash the sizes. */ 1584 /* Re-manage the text-area widget, and then thrash the sizes. */
1585 XtManageChild (x->edit_widget); 1585 XtManageChild (x->edit_widget);
1586 x_set_menu_resources_from_menu_face (f, x->menubar_widget);
1587 lw_refigure_widget (x->column_widget, True); 1586 lw_refigure_widget (x->column_widget, True);
1588 1587
1589 /* Force the pane widget to resize itself with the right values. */ 1588 /* Force the pane widget to resize itself with the right values. */
@@ -1835,8 +1834,7 @@ set_frame_menubar (f, first_time, deep_p)
1835 } 1834 }
1836 1835
1837 free_menubar_widget_value_tree (first_wv); 1836 free_menubar_widget_value_tree (first_wv);
1838 if (!update_frame_menubar (f)) 1837 update_frame_menubar (f);
1839 x_set_menu_resources_from_menu_face (f, menubar_widget);
1840 1838
1841 UNBLOCK_INPUT; 1839 UNBLOCK_INPUT;
1842} 1840}
@@ -2176,9 +2174,6 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
2176 /* Free the widget_value objects we used to specify the contents. */ 2174 /* Free the widget_value objects we used to specify the contents. */
2177 free_menubar_widget_value_tree (first_wv); 2175 free_menubar_widget_value_tree (first_wv);
2178 2176
2179 /* Override any default settings with ones from the `menu' face. */
2180 x_set_menu_resources_from_menu_face (f, menu);
2181
2182 /* No selection has been chosen yet. */ 2177 /* No selection has been chosen yet. */
2183 menu_item_selection = 0; 2178 menu_item_selection = 0;
2184 2179