Patch level : 2.1 48
Files correlati : Ricompilazione Demo : [ ] Commento : Corretta lista font disponibili git-svn-id: svn://10.65.10.50/trunk@12104 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
4cde8ad2b2
commit
895e0bc276
@ -486,16 +486,20 @@ long xvt_fmap_get_family_sizes(PRINT_RCD *precp, char *family, long *size_array,
|
|||||||
long size = 0;
|
long size = 0;
|
||||||
*scalable = FALSE;
|
*scalable = FALSE;
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
if (precp != NULL)
|
if (precp != NULL)
|
||||||
{
|
{
|
||||||
#ifdef WIN32
|
|
||||||
TwxPrintOut* po = m_PrintoutCache.Get((TPRINT_RCD*)precp);
|
TwxPrintOut* po = m_PrintoutCache.Get((TPRINT_RCD*)precp);
|
||||||
if (!po->HasBadDriver())
|
if (!po->HasBadDriver())
|
||||||
size = OsWin32_EnumerateSizes(po->GetDC()->GetHDC(), family, size_array, scalable, max_sizes);
|
size = OsWin32_EnumerateSizes(po->GetDC()->GetHDC(), family, size_array, scalable, max_sizes);
|
||||||
#else
|
|
||||||
size = OsLinux_EnumerateSizes(family, size_array, scalable, max_sizes);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
size = OsWin32_EnumerateSizes(NULL, family, size_array, scalable, max_sizes);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
size = OsLinux_EnumerateSizes(family, size_array, scalable, max_sizes);
|
||||||
|
#endif
|
||||||
|
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
@ -514,7 +518,11 @@ long xvt_fmap_get_families(PRINT_RCD *precp, char **family_array, long max_famil
|
|||||||
po->SetBadDriver(true);
|
po->SetBadDriver(true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
size = OsWin32_EnumerateFamilies(NULL, family_array, max_families);
|
{
|
||||||
|
wxWindow* tw = (wxWindow*)TASK_WIN;
|
||||||
|
wxClientDC dc(tw);
|
||||||
|
size = OsWin32_EnumerateFamilies(dc.GetHDC(), family_array, max_families);
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
size = OsLinux_EnumerateFamilies(family_array, max_families);
|
size = OsLinux_EnumerateFamilies(family_array, max_families);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user