Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied utf-8 fix patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-09-02 22:44:00 +00:00
parent f3d6a60294
commit 5707316c9c
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/fontmap.cpp
View File

@@ -161,8 +161,8 @@ static const wxChar* gs_encodingNames[] =
wxT( "windows-1256" ), wxT( "windows-1256" ),
wxT( "windows-1257" ), wxT( "windows-1257" ),
wxT( "windows-437" ), wxT( "windows-437" ),
wxT( "utf7" ), wxT( "utf-7" ),
wxT( "utf8" ), wxT( "utf-8" ),
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

3
src/common/wxchar.cpp
View File

@@ -105,7 +105,8 @@ bool WXDLLEXPORT wxOKlibc()
// this is UTF-8 allright, check whether that's what we want // this is UTF-8 allright, check whether that's what we want
char *cur_locale = setlocale(LC_CTYPE, NULL); char *cur_locale = setlocale(LC_CTYPE, NULL);
if ((strlen(cur_locale) < 4) || if ((strlen(cur_locale) < 4) ||
(strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) { (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
(strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
// nope, don't use libc conversion // nope, don't use libc conversion
return FALSE; return FALSE;
} }

6
src/unix/fontutil.cpp
View File

@@ -192,16 +192,14 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
break; break;
case wxFONTENCODING_UTF8: case wxFONTENCODING_UTF8:
// FIXME: this is probably false, but this is how they are called on info->xregistry = wxT("iso10646");
// my system and I don't know what the standard XFLD is (VZ)
info->xregistry = wxT("iso646.1991");
info->xencoding = wxT("*"); info->xencoding = wxT("*");
break; break;
case wxFONTENCODING_KOI8: case wxFONTENCODING_KOI8:
info->xregistry = wxT("koi8"); info->xregistry = wxT("koi8");
// we don't make distinction between koi8-r and koi8-u (so far) // we don't make distinction between koi8-r, koi8-u and koi8-ru (so far)
info->xencoding = wxT("*"); info->xencoding = wxT("*");
break; break;