(w32_native_per_char_metric): Disable 2002-01-20 change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 241bedb967c985234c100e11bff9e36b4c2df14f..c02cff4a414d0b112183926c3f61b1a0ae68d05d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-06  Jason Rumney  <jasonr@gnu.org>
+
+       * w32term.c (w32_native_per_char_metric):  Disable 2002-01-20 change.
+
 2002-02-06  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * charset.c (get_charset_id): Use if-else instead of ?:.

diff --git a/src/w32term.c b/src/w32term.c
index c9c38b51cb3d584b202279ee2a6219968c8f933a..25e8ac52a897040ee45910dcfe9482c1bfe321cd 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1238,18 +1238,22 @@ w32_native_per_char_metric (font, char2b, font_type, pcm)
 
       if (retval)
        {
+#if 0
+         /* Disabled until we can find a way to get the right results
+            on all versions of Windows.  */
+
          /* Don't trust the ABC widths.  For synthesized fonts they are
             wrong, and so is the result of GetCharWidth()!  */
          int real_width;
          GetCharWidth (hdc, *char2b, *char2b, &real_width);
-
+#endif
          pcm->width = char_widths.abcA + char_widths.abcB + char_widths.abcC;
-
+#if 0
          /* As far as I can tell, this is the best way to determine what
             ExtTextOut will do with the broken font.  */
          if (pcm->width != real_width)
            pcm->width = (pcm->width + real_width) / 2;
-
+#endif
          pcm->lbearing = char_widths.abcA;
          pcm->rbearing = pcm->width - char_widths.abcC;
          pcm->ascent = FONT_BASE (font);