diff options
| author | Gerd Moellmann | 1999-10-15 15:15:43 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-10-15 15:15:43 +0000 |
| commit | bf82bce457d7339e8468a52ae6f1687234a0c29b (patch) | |
| tree | d81acdd556829f0ef45c9eff514a6f2bfa5087d3 /src | |
| parent | 2710454de8166c36a792720e2baa1426f769ba31 (diff) | |
| download | emacs-bf82bce457d7339e8468a52ae6f1687234a0c29b.tar.gz emacs-bf82bce457d7339e8468a52ae6f1687234a0c29b.zip | |
(set_frame_menubar): Don't call
x_set_menu_resources_from_menu_face here.
(update_frame_menubar): Call x_set_menu_resources_from_menu_face.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmenu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index fde77cad82d..e5fffdaef5f 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1541,6 +1541,7 @@ update_frame_menubar (f) | |||
| 1541 | 1541 | ||
| 1542 | /* Re-manage the text-area widget, and then thrash the sizes. */ | 1542 | /* Re-manage the text-area widget, and then thrash the sizes. */ |
| 1543 | XtManageChild (x->edit_widget); | 1543 | XtManageChild (x->edit_widget); |
| 1544 | x_set_menu_resources_from_menu_face (f, x->menubar_widget); | ||
| 1544 | lw_refigure_widget (x->column_widget, True); | 1545 | lw_refigure_widget (x->column_widget, True); |
| 1545 | 1546 | ||
| 1546 | /* Force the pane widget to resize itself with the right values. */ | 1547 | /* Force the pane widget to resize itself with the right values. */ |
| @@ -1788,7 +1789,6 @@ set_frame_menubar (f, first_time, deep_p) | |||
| 1788 | f->output_data.x->menubar_height = menubar_size; | 1789 | f->output_data.x->menubar_height = menubar_size; |
| 1789 | } | 1790 | } |
| 1790 | 1791 | ||
| 1791 | x_set_menu_resources_from_menu_face (f, f->output_data.x->menubar_widget); | ||
| 1792 | free_menubar_widget_value_tree (first_wv); | 1792 | free_menubar_widget_value_tree (first_wv); |
| 1793 | update_frame_menubar (f); | 1793 | update_frame_menubar (f); |
| 1794 | 1794 | ||