Mercurial > emacs
changeset 43470:842910bb2fc0
(w32_text_out): Renamed from W32_TEXTOUT.
Call ExtTextOutA rather than ExtTextOut.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Fri, 22 Feb 2002 23:59:50 +0000 |
| parents | 1e76e5ebe710 |
| children | 20574c51c791 |
| files | src/w32term.c |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32term.c Fri Feb 22 23:58:11 2002 +0000 +++ b/src/w32term.c Fri Feb 22 23:59:50 2002 +0000 @@ -2735,7 +2735,8 @@ /* Encapsulate the different ways of displaying text under W32. */ -void W32_TEXTOUT (s, x, y,chars,nchars) +static void +w32_text_out (s, x, y,chars,nchars) struct glyph_string * s; int x, y; wchar_t * chars; @@ -2749,8 +2750,8 @@ else if (s->first_glyph->w32_font_type == UNICODE_FONT) ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL); else - ExtTextOut (s->hdc, x, y, 0, NULL, (char *) chars, - nchars * charset_dim, NULL); + ExtTextOutA (s->hdc, x, y, 0, NULL, (char *) chars, + nchars * charset_dim, NULL); } #if GLYPH_DEBUG @@ -3483,7 +3484,7 @@ char1b[i] = BYTE2 (s->char2b[i]); /* Draw text with TextOut and friends. */ - W32_TEXTOUT (s, x, s->ybase - boff, s->char2b, s->nchars); + w32_text_out (s, x, s->ybase - boff, s->char2b, s->nchars); } if (s->font && s->font->hfont) SelectObject (s->hdc, old_font); @@ -3530,7 +3531,7 @@ else { for (i = 0; i < s->nchars; i++, ++s->gidx) - W32_TEXTOUT (s, x + s->cmp->offsets[s->gidx * 2], + w32_text_out (s, x + s->cmp->offsets[s->gidx * 2], s->ybase - s->cmp->offsets[s->gidx * 2 + 1], s->char2b + i, 1); }