comparison src/objects-msw.c @ 5009:2eec7322eb7f

Miscellaneous small fixes to Windows VS6 build
author Vin Shelton <acs@xemacs.org>
date Tue, 09 Feb 2010 16:25:04 -0500
parents 3c3c1d139863
children 7e57c0575a15
comparison
equal deleted inserted replaced
5006:ecdc03ef6e12 5009:2eec7322eb7f
2079 else 2079 else
2080 { 2080 {
2081 assert(0); 2081 assert(0);
2082 } 2082 }
2083 2083
2084 HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil, 2084 {
2085 font_list, 2085 HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil,
2086 ERROR_ME_DEBUG_WARN, 2086 font_list,
2087 &truename); 2087 ERROR_ME_DEBUG_WARN,
2088 2088 &truename);
2089 if (!hfont || !(hfont = (HFONT) SelectObject (hdc, hfont))) 2089
2090 { 2090 if (!hfont || !(hfont = (HFONT) SelectObject (hdc, hfont)))
2091 nope: 2091 {
2092 DeleteDC (hdc); 2092 nope:
2093 UNGCPRO; 2093 DeleteDC (hdc);
2094 return 0; 2094 UNGCPRO;
2095 } 2095 return 0;
2096 2096 }
2097 if (GetTextCharsetInfo (hdc, &fs, 0) == DEFAULT_CHARSET) 2097
2098 { 2098 if (GetTextCharsetInfo (hdc, &fs, 0) == DEFAULT_CHARSET)
2099 SelectObject (hdc, hfont); 2099 {
2100 goto nope; 2100 SelectObject (hdc, hfont);
2101 } 2101 goto nope;
2102 SelectObject (hdc, hfont); 2102 }
2103 DeleteDC (hdc); 2103 SelectObject (hdc, hfont);
2104 Fputhash (reloc, make_opaque (&fs, sizeof (fs)), Vfont_signature_data); 2104 DeleteDC (hdc);
2105 UNGCPRO; 2105 Fputhash (reloc, make_opaque (&fs, sizeof (fs)), Vfont_signature_data);
2106 UNGCPRO;
2107 }
2106 } 2108 }
2107 2109
2108 { 2110 {
2109 int lowlim, highlim; 2111 int lowlim, highlim;
2110 int dim, j, cp = -1; 2112 int dim, j, cp = -1;