comparison src/w32term.c @ 53469:112be2022ce0

(w32_text_out): Use s->font, for consistency with callers.
author Jason Rumney <jasonr@gnu.org>
date Thu, 01 Jan 2004 22:51:02 +0000
parents bac3029f6282
children 4262a032b45b 0abaf12fa706
comparison
equal deleted inserted replaced
53468:f641b341c5ec 53469:112be2022ce0
1119 struct glyph_string * s; 1119 struct glyph_string * s;
1120 int x, y; 1120 int x, y;
1121 wchar_t * chars; 1121 wchar_t * chars;
1122 int nchars; 1122 int nchars;
1123 { 1123 {
1124 int charset_dim = w32_font_is_double_byte (s->gc->font) ? 2 : 1; 1124 int charset_dim = w32_font_is_double_byte (s->font) ? 2 : 1;
1125 if (s->gc->font->bdf) 1125 if (s->font->bdf)
1126 w32_BDF_TextOut (s->gc->font->bdf, s->hdc, 1126 w32_BDF_TextOut (s->font->bdf, s->hdc,
1127 x, y, (char *) chars, charset_dim, 1127 x, y, (char *) chars, charset_dim,
1128 nchars * charset_dim, 0); 1128 nchars * charset_dim, 0);
1129 else if (s->first_glyph->font_type == UNICODE_FONT) 1129 else if (s->first_glyph->font_type == UNICODE_FONT)
1130 ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL); 1130 ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL);
1131 else 1131 else