mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Code Issues Releases Activity

(update_frame_menubar, set_frame_menubar, xmenu_show):

Browse Source 
Remove calls to x_set_menu_resources_from_menu_face.
This commit is contained in:
Gerd Moellmann 2001-03-22 18:34:55 +00:00
parent 7dc17ed0b7
commit 364cd45042
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ChangeLog
View File

@ -1,5 +1,17 @@
2001-03-22 Gerd Moellmann <gerd@gnu.org>
* xfaces.c (x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Removed, together with subroutines.
(x_set_menu_face_resources) [USE_X_TOOLKIT]: New function.
(realize_basic_faces) [USE_X_TOOLKIT]: Call
x_set_menu_face_resources.
* dispextern.h (x_set_menu_resources_from_menu_face): Remove
prototype.
* xmenu.c (update_frame_menubar, set_frame_menubar, xmenu_show):
Remove calls to x_set_menu_resources_from_menu_face.
* xfaces.c (xm_set_menu_resources_from_menu_face): Remove
#ifndef LESSTIF_VERSION.

7
src/xmenu.c
View File

@ -1583,7 +1583,6 @@ update_frame_menubar (f)
/* 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 @@ set_frame_menubar (f, first_time, deep_p)
}
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 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
/* 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;