Mercurial > hg > xemacs-beta
comparison src/objects-msw.c @ 4579:68f74b080e94
Accept msprinter and mswindows, mswindows_font_spec_matches_charset_stage_2
src/ChangeLog addition:
2009-01-10 Aidan Kehoe <kehoea@parhasard.net>
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
Accept msprinter as well as mswindows devices here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 18 Jan 2009 12:41:58 +0000 |
parents | 4143b78d0df0 |
children | 8b63e21b0436 |
comparison
equal
deleted
inserted
replaced
4578:49e17f7182f5 | 4579:68f74b080e94 |
---|---|
2062 UNGCPRO; | 2062 UNGCPRO; |
2063 } | 2063 } |
2064 else | 2064 else |
2065 { | 2065 { |
2066 HDC hdc = CreateCompatibleDC (NULL); | 2066 HDC hdc = CreateCompatibleDC (NULL); |
2067 Lisp_Object font_list = DEVICE_MSWINDOWS_FONTLIST (d); | 2067 Lisp_Object font_list = Qnil, truename; |
2068 Lisp_Object truename; | 2068 |
2069 if (DEVICE_TYPE_P (d, mswindows)) | |
2070 { | |
2071 font_list = DEVICE_MSWINDOWS_FONTLIST (d); | |
2072 } | |
2073 else if (DEVICE_TYPE_P (d, msprinter)) | |
2074 { | |
2075 font_list = DEVICE_MSPRINTER_FONTLIST (d); | |
2076 } | |
2077 else | |
2078 { | |
2079 assert(0); | |
2080 } | |
2081 | |
2069 HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil, | 2082 HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil, |
2070 font_list, | 2083 font_list, |
2071 ERROR_ME_DEBUG_WARN, | 2084 ERROR_ME_DEBUG_WARN, |
2072 &truename); | 2085 &truename); |
2073 | 2086 |