Mercurial > hg > xemacs-beta

diff lwlib/xlwmenu.c @ 181:bfd6434d15b3 r20-3b17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b17
author cvs
date Mon, 13 Aug 2007 09:53:19 +0200
parents 6075d714658b
children e121b013d1f0
line wrap: on
line diff
--- a/lwlib/xlwmenu.c	Mon Aug 13 09:52:21 2007 +0200
+++ b/lwlib/xlwmenu.c	Mon Aug 13 09:53:19 2007 +0200
@@ -401,6 +401,11 @@
   XmStringExtent (mw->menu.font_list, s, &width, &height);
   return width;
 #else
+# ifdef USE_XFONTSET
+  XRectangle ri, rl;
+  XmbTextExtents (mw->menu.font_set, string, strlen (string), &ri, &rl);
+  return rl.width;
+# else /* ! USE_XFONTSET */
   XCharStruct xcs;
   int i,s=0,w=0;
   int drop;
@@ -417,6 +422,7 @@
 	  w += xcs.width;
   }
   return w;
+# endif /* USE_XFONTSET */
 #endif
 }