Lots of Unix/Unicode compile fixes, some of which

are just #ifdef 0 such as the wxExecute calls
    in gdcps.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-05 18:04:08 +00:00
parent d7a7bd6d27
commit 401eb3dec2
28 changed files with 121 additions and 48 deletions

View File

@@ -107,7 +107,12 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
{
char *font = fonts[n];
#if wxUSE_REGEX
#if wxUSE_UNICODE
wxString sfont( wxConvLocal.cMB2WC( font ) );
if ( !re.Matches(sfont) )
#else
if ( !re.Matches(font) )
#endif
#else // !wxUSE_REGEX
if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
#endif // wxUSE_REGEX/!wxUSE_REGEX
@@ -120,7 +125,11 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
char *family = dash + 1;
dash = strchr(family, '-');
*dash = '\0'; // !NULL because Matches() above succeeded
#if wxUSE_UNICODE
wxString fam( wxConvLocal.cMB2WC( family ) );
#else
wxString fam(family);
#endif
if ( families.Index(fam) == wxNOT_FOUND )
{