From fb055d618a48aabc17d0d4077b6e533cf412ab99 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 20 May 2004 11:07:27 +0000 Subject: [PATCH] Patch level : 2.1 48 Files correlati : xvaga.dll Ricompilazione Demo : [ ] Commento : Estesa la funzionalita' xvt_font_map_enum_families in modo da poter enumerare anche i font del video e non solo quelli della stampante git-svn-id: svn://10.65.10.50/trunk@12101 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- xvaga/xvtextra.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xvaga/xvtextra.cpp b/xvaga/xvtextra.cpp index 0aca1225e..bd05dcbde 100755 --- a/xvaga/xvtextra.cpp +++ b/xvaga/xvtextra.cpp @@ -505,18 +505,21 @@ long xvt_fmap_get_families(PRINT_RCD *precp, char **family_array, long max_famil long size = 0; family_array[0] = NULL; - if (precp != NULL) - { #ifdef WIN32 + if (precp != NULL) + { TwxPrintOut* po = m_PrintoutCache.Get((TPRINT_RCD*)precp); - size = OsWin32_EnumerateFamilies(po->GetDC()->GetHDC(), family_array, max_families); + size = OsWin32_EnumerateFamilies(po->GetDC()->GetHDC(), family_array, max_families); if (size == 0) po->SetBadDriver(true); + } + else + size = OsWin32_EnumerateFamilies(NULL, family_array, max_families); #else - size = OsLinux_EnumerateFamilies(family_array, max_families); + size = OsLinux_EnumerateFamilies(family_array, max_families); #endif - } - return size; + + return size; }