mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-20 10:23:57 +00:00
(xm_set_menu_resources_from_menu_face): Remove
#ifndef LESSTIF_VERSION.
This commit is contained in:
parent
b7a084f6f0
commit
823ba8d8b3
@ -4429,15 +4429,11 @@ xm_set_menu_resources_from_menu_face (f, widget)
|
||||
|| !UNSPECIFIEDP (LFACE_SLANT (lface))
|
||||
|| !UNSPECIFIEDP (LFACE_HEIGHT (lface))))
|
||||
{
|
||||
#ifndef LESSTIF_VERSION
|
||||
/* Setting the font leads to an infinite loop somewhere
|
||||
in LessTif during geometry computation. */
|
||||
XmFontListEntry fe;
|
||||
fe = XmFontListEntryCreate ("menu_font", XmFONT_IS_FONT, face->font);
|
||||
fl = XmFontListAppendEntry (NULL, fe);
|
||||
XtSetArg (av[ac], XmNfontList, fl);
|
||||
++ac;
|
||||
#endif
|
||||
}
|
||||
|
||||
xassert (ac <= sizeof av / sizeof *av);
|
||||
@ -4449,6 +4445,7 @@ xm_set_menu_resources_from_menu_face (f, widget)
|
||||
XtSetValues (widget, av, ac);
|
||||
res.av = av, res.ac = ac;
|
||||
XtApplyToWidgets (widget, xm_apply_resources, &res);
|
||||
|
||||
if (fl)
|
||||
XmFontListFree (fl);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user