aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2007-06-02 22:06:27 +0000
committerJason Rumney2007-06-02 22:06:27 +0000
commit88fce384f4873c6bd482fb96f3523623aa3abe6c (patch)
tree5992dec3b608c45c5755fd88ed11caaf1e6fe139 /src
parent6d8c85b50c8e287ae61a8f6df0de7b2205bfaee2 (diff)
downloademacs-88fce384f4873c6bd482fb96f3523623aa3abe6c.tar.gz
emacs-88fce384f4873c6bd482fb96f3523623aa3abe6c.zip
(w32_load_system_font, w32_list_fonts): Use FONT_AVG_WIDTH.
Diffstat (limited to 'src')
-rw-r--r--src/w32fns.c6
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)
4713 if ((lf.lfPitchAndFamily & 0x03) == FIXED_PITCH) 4713 if ((lf.lfPitchAndFamily & 0x03) == FIXED_PITCH)
4714 { 4714 {
4715 /* Fixed width font. */ 4715 /* Fixed width font. */
4716 fontp->average_width = fontp->space_width = FONT_WIDTH (font); 4716 fontp->average_width = fontp->space_width = FONT_AVG_WIDTH (font);
4717 } 4717 }
4718 else 4718 else
4719 { 4719 {
@@ -4723,7 +4723,7 @@ w32_load_system_font (f,fontname,size)
4723 if (pcm) 4723 if (pcm)
4724 fontp->space_width = pcm->width; 4724 fontp->space_width = pcm->width;
4725 else 4725 else
4726 fontp->space_width = FONT_WIDTH (font); 4726 fontp->space_width = FONT_AVG_WIDTH (font);
4727 4727
4728 fontp->average_width = font->tm.tmAveCharWidth; 4728 fontp->average_width = font->tm.tmAveCharWidth;
4729 } 4729 }
@@ -6267,7 +6267,7 @@ w32_list_fonts (f, pattern, size, maxnames)
6267 hdc = GetDC (dpyinfo->root_window); 6267 hdc = GetDC (dpyinfo->root_window);
6268 oldobj = SelectObject (hdc, thisinfo.hfont); 6268 oldobj = SelectObject (hdc, thisinfo.hfont);
6269 if (GetTextMetrics (hdc, &thisinfo.tm)) 6269 if (GetTextMetrics (hdc, &thisinfo.tm))
6270 XSETCDR (tem, make_number (FONT_WIDTH (&thisinfo))); 6270 XSETCDR (tem, make_number (FONT_AVG_WIDTH (&thisinfo)));
6271 else 6271 else
6272 XSETCDR (tem, make_number (0)); 6272 XSETCDR (tem, make_number (0));
6273 SelectObject (hdc, oldobj); 6273 SelectObject (hdc, oldobj);