Mercurial > hg > xemacs-beta

comparison src/objects-msw.c @ 4985:358aa3bb603f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 12:12:28 -0600
parents 3c3c1d139863
children 2eec7322eb7f d95c102a96d3
comparison
equal deleted inserted replaced
4984:f23cd0184dcf 4985:358aa3bb603f
1107 * 'on-the-fly' are not enumerated. It would be overly restrictive to 1107 * 'on-the-fly' are not enumerated. It would be overly restrictive to
1108 * disallow Bold And Italic weights for these fonts, so we just leave 1108 * disallow Bold And Italic weights for these fonts, so we just leave
1109 * weights unspecified. This means that we have to weed out duplicates of 1109 * weights unspecified. This means that we have to weed out duplicates of
1110 * those fonts that do get enumerated with different weights. 1110 * those fonts that do get enumerated with different weights.
1111 */ 1111 */
1112 TSTR_TO_C_STRING (lpelfe->elfLogFont.lfFaceName, facename); 1112 facename = TSTR_TO_ITEXT (lpelfe->elfLogFont.lfFaceName);
1113 if (itext_ichar (facename) == '@') 1113 if (itext_ichar (facename) == '@')
1114 /* This is a font for writing vertically. We ignore it. */ 1114 /* This is a font for writing vertically. We ignore it. */
1115 return 1; 1115 return 1;
1116 1116
1117 if (FontType == 0 /*vector*/ || FontType & TRUETYPE_FONTTYPE) 1117 if (FontType == 0 /*vector*/ || FontType & TRUETYPE_FONTTYPE)
1487 1487
1488 if (fields > 0 && qxestrlen (fontname)) 1488 if (fields > 0 && qxestrlen (fontname))
1489 { 1489 {
1490 Extbyte *extfontname; 1490 Extbyte *extfontname;
1491 1491
1492 C_STRING_TO_TSTR (fontname, extfontname); 1492 extfontname = ITEXT_TO_TSTR (fontname);
1493 if (logfont) 1493 if (logfont)
1494 { 1494 {
1495 qxetcsncpy ((Extbyte *) logfont->lfFaceName, extfontname, 1495 qxetcsncpy ((Extbyte *) logfont->lfFaceName, extfontname,
1496 LF_FACESIZE - 1); 1496 LF_FACESIZE - 1);
1497 logfont->lfFaceName[LF_FACESIZE - 1] = 0; 1497 logfont->lfFaceName[LF_FACESIZE - 1] = 0;