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

diff --git a/src/w32term.c b/src/w32term.c
index 119e77b2a73809894a176ebe9d5bb477a7b8d3c4..4aa221e7c34ca7f166e673c9372c9fef7e18f94e 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1220,18 +1220,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 = char_widths.abcA + char_widths.abcB;
          pcm->ascent = FONT_BASE (font);