From: Jason Rumney Date: Sat, 2 Jun 2007 22:06:27 +0000 (+0000) Subject: (w32_load_system_font, w32_list_fonts): Use FONT_AVG_WIDTH. X-Git-Tag: emacs-pretest-23.0.90~8295^2~457 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88fce384f4873c6bd482fb96f3523623aa3abe6c;p=emacs.git (w32_load_system_font, w32_list_fonts): Use FONT_AVG_WIDTH. --- diff --git a/src/w32fns.c b/src/w32fns.c index d3e0dc1be15..dc36f41575b 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4713,7 +4713,7 @@ w32_load_system_font (f,fontname,size) 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 @@ w32_load_system_font (f,fontname,size) 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 @@ w32_list_fonts (f, pattern, size, maxnames) 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);