diff options
| author | Jason Rumney <jasonr@gnu.org> | 2007-06-02 22:06:27 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2007-06-02 22:06:27 +0000 |
| commit | 88fce384f4873c6bd482fb96f3523623aa3abe6c (patch) | |
| tree | 5992dec3b608c45c5755fd88ed11caaf1e6fe139 /src | |
| parent | 6d8c85b50c8e287ae61a8f6df0de7b2205bfaee2 (diff) | |
| download | emacs-88fce384f4873c6bd482fb96f3523623aa3abe6c.tar.gz emacs-88fce384f4873c6bd482fb96f3523623aa3abe6c.tar.bz2 emacs-88fce384f4873c6bd482fb96f3523623aa3abe6c.zip | |
(w32_load_system_font, w32_list_fonts): Use FONT_AVG_WIDTH.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |