suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed font substitution

Browse Source 
svn: r76
This commit is contained in:
Matthew Flatt 2005-06-08 15:59:17 +00:00
parent 07279e6286
commit cc962e7e3c
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/wxwindow/src/msw/wx_dc.cxx
View File

@ -1659,17 +1659,42 @@ static int substitute_font(wchar_t *ustring, int d, int alen, wxFont *font, HDC
sub = font->Substitute(v, dc, screen_font);
if (sub) {
HFONT cfont;
font = sub;
cfont = font->BuildInternalFont(dc, screen_font, angle);
int max_alen;
/* Continue using this substituion as long as
glyphs are in this font and not in the original font. */
max_alen = alen;
for (i = 1; i < alen; i++) {
v = ustring[d+i];
if (font->GlyphAvailableNow(v, dc, screen_font)) {
max_alen = i;
break;
}
}
cfont = sub->BuildInternalFont(dc, screen_font, angle);
if (cfont) {
font = sub;
::SelectObject(dc, cfont);
*reset = 1;
for (i = 1; i < max_alen; i++) {
v = ustring[d+i];
if (!font->GlyphAvailableNow(v, dc, screen_font)) {
max_alen = i;
break;
}
}
return max_alen;
}
}
}
for (i = 1; i < alen; i++) {
v = ustring[d+i];
if (!font->GlyphAvailableNow(v, dc, screen_font)) {
return i;
/* Continue for as long as glyphs are in this font */
for (i = 1; i < alen; i++) {
v = ustring[d+i];
if (!font->GlyphAvailableNow(v, dc, screen_font)) {
return i;
}
}
}