From 823ba8d8b3d90ba15abc60f56df62369a2d52fb1 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 22 Mar 2001 13:33:13 +0000 Subject: [PATCH] (xm_set_menu_resources_from_menu_face): Remove #ifndef LESSTIF_VERSION. --- src/xfaces.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/xfaces.c b/src/xfaces.c index e74147c6377..4fd21fee093 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -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); } -- 2.39.2