Mercurial > emacs
changeset 109174:01e36ca71747
Fix compilation for Motif/Lesstif.
* xmenu.c (set_frame_menubar, create_and_show_popup_menu)
(create_and_show_dialog): Don't call apply_systemfont_to_(menu|dialog)
unless USE_LUCID.
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 08 Jul 2010 12:35:54 +0200 |
| parents | 33021b778d4d |
| children | fdb79ffbe27c 074605ee311f 7be7159afb6f |
| files | src/ChangeLog src/xmenu.c |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 08 12:29:51 2010 +0200 +++ b/src/ChangeLog Thu Jul 08 12:35:54 2010 +0200 @@ -1,3 +1,9 @@ +2010-07-08 Jan Djärv <jan.h.d@swipnet.se> + + * xmenu.c (set_frame_menubar, create_and_show_popup_menu) + (create_and_show_dialog): Don't call apply_systemfont_to_(menu|dialog) + unless USE_LUCID. + 2010-07-08 Dan Nicolaescu <dann@ics.uci.edu> * xdisp.c (store_mode_line_noprop_char): Remove K&R alternative declaration.
--- a/src/xmenu.c Thu Jul 08 12:29:51 2010 +0200 +++ b/src/xmenu.c Thu Jul 08 12:35:54 2010 +0200 @@ -1282,7 +1282,9 @@ /* Make menu pop down on C-g. */ XtOverrideTranslations (menubar_widget, override); +#ifdef USE_LUCID apply_systemfont_to_menu (menubar_widget); +#endif } { @@ -1614,7 +1616,9 @@ popup_deactivate_callback, menu_highlight_callback); +#ifdef USE_LUCID apply_systemfont_to_menu (menu); +#endif dummy.type = ButtonPress; dummy.serial = 0; @@ -2016,7 +2020,7 @@ abort(); dialog_id = widget_id_tick++; -#ifdef HAVE_XFT +#ifdef USE_LUCID apply_systemfont_to_dialog (f->output_data.x->widget); #endif lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv,