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

Unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-11-13 10:51:40 +00:00
parent 958012e0bd
commit 511f273f9e
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/common/fontmap.cpp
View File

@@ -46,10 +46,10 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the config paths we use // the config paths we use
static const char* FONTMAPPER_ROOT_PATH = _T("FontMapper"); static const wxChar* FONTMAPPER_ROOT_PATH = wxT("FontMapper");
static const char* FONTMAPPER_CHARSET_PATH = _T("Charsets"); static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
static const char* FONTMAPPER_CHARSET_ALIAS_PATH = _T("Aliases"); static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
static const char* FONTMAPPER_FONT_FROM_ENCODING_PATH = _T("Encodings"); static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
// encodings supported by GetEncodingDescription // encodings supported by GetEncodingDescription
static wxFontEncoding gs_encodings[] = static wxFontEncoding gs_encodings[] =
@@ -112,30 +112,30 @@ static const wxChar* gs_encodingDescs[] =
// and the internal names // and the internal names
static const wxChar* gs_encodingNames[] = static const wxChar* gs_encodingNames[] =
{ {
"iso8859-1", wxT( "iso8859-1" ),
"iso8859-2", wxT( "iso8859-2" ),
"iso8859-3", wxT( "iso8859-3" ),
"iso8859-4", wxT( "iso8859-4" ),
"iso8859-5", wxT( "iso8859-5" ),
"iso8859-6", wxT( "iso8859-6" ),
"iso8859-7", wxT( "iso8859-7" ),
"iso8859-8", wxT( "iso8859-8" ),
"iso8859-9", wxT( "iso8859-9" ),
"iso8859-10", wxT( "iso8859-10" ),
"iso8859-11", wxT( "iso8859-11" ),
"iso8859-12", wxT( "iso8859-12" ),
"iso8859-13", wxT( "iso8859-13" ),
"iso8859-14", wxT( "iso8859-14" ),
"iso8859-15", wxT( "iso8859-15" ),
"koi8-r", wxT( "koi8-r" ),
"windows1250", wxT( "windows1250" ),
"windows1251", wxT( "windows1251" ),
"windows1252", wxT( "windows1252" ),
"windows1253", wxT( "windows1253" ),
"windows1254", wxT( "windows1254" ),
"windows1255", wxT( "windows1255" ),
"windows1256", wxT( "windows1256" ),
"windows1257", wxT( "windows1257" ),
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -395,7 +395,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
else if ( cs.Left(8) == _T("WINDOWS-") ) else if ( cs.Left(8) == _T("WINDOWS-") )
{ {
int value; int value;
if ( wxSscanf(cs.c_str() + 8, "%u", &value) == 1 ) if ( wxSscanf(cs.c_str() + 8, wxT("%u"), &value) == 1 )
{ {
if ( value >= 1250 ) if ( value >= 1250 )
{ {