From 522140507401f71d5884cf3fc63aaf432e4aba19 Mon Sep 17 00:00:00 2001 From: Jan D Date: Thu, 8 Jul 2010 12:35:54 +0200 Subject: [PATCH] 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. --- src/ChangeLog | 6 ++++++ src/xmenu.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6daf98787a..d81c7e0162 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-07-08 Jan Djärv + + * 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 * xdisp.c (store_mode_line_noprop_char): Remove K&R alternative declaration. diff --git a/src/xmenu.c b/src/xmenu.c index 701433e790..614ee7e8a4 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1282,7 +1282,9 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) /* 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 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp) 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 @@ create_and_show_dialog (f, first_wv) 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, -- 2.20.1