procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation for Motif/Lesstif.

Browse source 
* 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.
This commit is contained in:
Jan D 2010-07-08 12:35:54 +02:00
parent c825c0b647
commit 5221405074
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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.

6
src/xmenu.c
View file

@ -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,