# HG changeset patch # User Gerd Moellmann # Date 985267993 0 # Node ID 798523f71b16421f1b138761b9565c751436f654 # Parent 508fd85ab81620a7382790af7591c3458c4304c8 (xm_set_menu_resources_from_menu_face): Remove #ifndef LESSTIF_VERSION. diff -r 508fd85ab816 -r 798523f71b16 src/xfaces.c --- a/src/xfaces.c Wed Mar 21 20:58:57 2001 +0000 +++ b/src/xfaces.c Thu Mar 22 13:33:13 2001 +0000 @@ -4429,15 +4429,11 @@ || !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 @@ XtSetValues (widget, av, ac); res.av = av, res.ac = ac; XtApplyToWidgets (widget, xm_apply_resources, &res); + if (fl) XmFontListFree (fl); }