summaryrefslogtreecommitdiff
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorJan D <jan.h.d@swipnet.se>2010-07-08 12:35:54 +0200
committerJan D <jan.h.d@swipnet.se>2010-07-08 12:35:54 +0200
commit41d81786331d91e4050a9816a754dd057bcf4783 (patch)
tree73c434fb60492af3740854d128a2e8d28a30cf2e /src/xmenu.c
parent44da906354d50410e0740fba5ad6b3a0f6a30eab (diff)
downloademacs-41d81786331d91e4050a9816a754dd057bcf4783.tar.gz
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.
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 701433e7907..614ee7e8a4b 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,