[Emacs-diffs] /srv/bzr/emacs/trunk r100755: Fix compilation for Motif/Lesstif.

[Jan D]

------------------------------------------------------------
revno: 100755
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-08 12:35:54 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-08 05:42:59 +0000
+++ b/src/ChangeLog     2010-07-08 10:35:54 +0000
@@ -1,3 +1,9 @@
+2010-07-08  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (store_mode_line_noprop_char): Remove K&R alternative 
declaration.

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2010-07-07 22:18:28 +0000
+++ b/src/xmenu.c       2010-07-08 10:35:54 +0000
@@ -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,