From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 6 Oct 1999 23:13:21 +0000 (+0000)
Subject: (set_frame_menubar, xmenu_show): Call
X-Git-Tag: emacs-pretest-21.0.90~6558
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac44152803324a96100bb39ea1179e90091fbaf5;p=emacs.git

(set_frame_menubar, xmenu_show): Call
x_set_menu_resources_from_menu_face.
---

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)
 
   /* Force the pane widget to resize itself with the right values.  */
   EmacsFrameSetCharSize (x->edit_widget, columns, rows);
-
   UNBLOCK_INPUT;
 }
 
@@ -1789,8 +1788,8 @@ set_frame_menubar (f, first_time, deep_p)
     f->output_data.x->menubar_height = menubar_size;
   }
   
+  x_set_menu_resources_from_menu_face (f, f->output_data.x->menubar_widget);
   free_menubar_widget_value_tree (first_wv);
-
   update_frame_menubar (f);
 
   UNBLOCK_INPUT;
@@ -2135,6 +2134,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
 
   /* Display the menu.  */
   lw_popup_menu (menu, &dummy);
+  x_set_menu_resources_from_menu_face (f, menu);
   popup_activated_flag = 1;
 
   /* Process events that apply to the menu.  */