(w32_to_x_font): Avoid forcing font widths.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9bb33016bb45314ebf713fd6a71e5ae2d7e069d7..d4ba5c96723a90643da849953669d8ef490629c3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-25  Jason Rumney  <jasonr@gnu.org>
+
+       * w32fns.c (w32_to_x_font): Avoid forcing font widths.
+
 2005-10-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * image.c [MAC_OS] (image_load_qt_1): Check image size.

diff --git a/src/w32fns.c b/src/w32fns.c
index 934694181377d717a52b9d8c6385c3eb9575b27b..e18ee3d43a982c0056fb4702c0e63a769010a8a3 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5284,9 +5284,13 @@ w32_to_x_font (lplogfont, lpxstr, len, specific_charset)
       strcpy (height_pixels, "*");
       strcpy (height_dpi, "*");
     }
+
+#if 0 /* Never put the width in the xfld. It fails on fonts with
+        double-width characters.  */
   if (lplogfont->lfWidth)
     sprintf (width_pixels, "%u", lplogfont->lfWidth * 10);
   else
+#endif
     strcpy (width_pixels, "*");
 
   _snprintf (lpxstr, len - 1,