Mercurial > emacs

diff src/xmenu.c @ 109174:01e36ca71747

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 750db9f3e6d8
children 8cfee7d2955f
line wrap: on
line diff
--- 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,