comparison src/xmenu.c @ 31365:048a65296215

(xmenu_show): Call x_set_menu_resources_from_menu_face before initially popping up the menu, so the menu doesn't flash when the face settings are significantly different from the defaults.
author Miles Bader <miles@gnu.org>
date Mon, 04 Sep 2000 11:56:36 +0000
parents 07c39ec7b96b
children b58d8e366faa
comparison
equal deleted inserted replaced
31364:8bafcf2cfd57 31365:048a65296215
2195 XtSetValues (menu, av, ac); 2195 XtSetValues (menu, av, ac);
2196 2196
2197 /* Free the widget_value objects we used to specify the contents. */ 2197 /* Free the widget_value objects we used to specify the contents. */
2198 free_menubar_widget_value_tree (first_wv); 2198 free_menubar_widget_value_tree (first_wv);
2199 2199
2200 /* Override any default settings with ones from the `menu' face. */
2201 x_set_menu_resources_from_menu_face (f, menu);
2202
2200 /* No selection has been chosen yet. */ 2203 /* No selection has been chosen yet. */
2201 menu_item_selection = 0; 2204 menu_item_selection = 0;
2202 2205
2203 /* Display the menu. */ 2206 /* Display the menu. */
2204 lw_popup_menu (menu, (XEvent *) &dummy); 2207 lw_popup_menu (menu, (XEvent *) &dummy);
2205 x_set_menu_resources_from_menu_face (f, menu);
2206 popup_activated_flag = 1; 2208 popup_activated_flag = 1;
2207 2209
2208 /* Process events that apply to the menu. */ 2210 /* Process events that apply to the menu. */
2209 popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id); 2211 popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id);
2210 2212