(update_frame_menubar, set_frame_menubar, xmenu_show):

Remove calls to x_set_menu_resources_from_menu_face.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0e3cda1ee29eeccc00f45953c6bed5e0c0ea9330..2931cfe7c2124290a2e0206a0dd5822ce7758d5c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
 

diff --git a/src/xmenu.c b/src/xmenu.c
index de74d6b1645608c953a5dae689b7c70dc3457d3e..7e7cf2ab71bd6e6867f0d320a35851ffe8712a42 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -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;