# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1180821987 0
# Node ID f9569f59a8351f63918cf8ff456cfd68a0229f14
# Parent  4d94a4dbcf9906d4e3b521b4d053e65cb0515925
(w32_load_system_font, w32_list_fonts): Use FONT_AVG_WIDTH.

diff -r 4d94a4dbcf99 -r f9569f59a835 src/w32fns.c
--- a/src/w32fns.c	Sat Jun 02 00:50:32 2007 +0000
+++ b/src/w32fns.c	Sat Jun 02 22:06:27 2007 +0000
@@ -4713,7 +4713,7 @@
     if ((lf.lfPitchAndFamily & 0x03) == FIXED_PITCH)
       {
 	/* Fixed width font.  */
-	fontp->average_width = fontp->space_width = FONT_WIDTH (font);
+	fontp->average_width = fontp->space_width = FONT_AVG_WIDTH (font);
       }
     else
       {
@@ -4723,7 +4723,7 @@
 	if (pcm)
 	  fontp->space_width = pcm->width;
 	else
-	  fontp->space_width = FONT_WIDTH (font);
+	  fontp->space_width = FONT_AVG_WIDTH (font);
 
 	fontp->average_width = font->tm.tmAveCharWidth;
       }
@@ -6267,7 +6267,7 @@
               hdc = GetDC (dpyinfo->root_window);
               oldobj = SelectObject (hdc, thisinfo.hfont);
               if (GetTextMetrics (hdc, &thisinfo.tm))
-                XSETCDR (tem, make_number (FONT_WIDTH (&thisinfo)));
+                XSETCDR (tem, make_number (FONT_AVG_WIDTH (&thisinfo)));
               else
                 XSETCDR (tem, make_number (0));
               SelectObject (hdc, oldobj);