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

accept windowsXXXX as well as windowsXXX in CharsetToEncoding

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-08-13 13:28:50 +00:00
parent daf91c018c
commit cb3c5d853f
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/fontmap.cpp
View File

@@ -140,15 +140,15 @@ static const wxChar* gs_encodingNames[] =
wxT( "iso8859-14" ),
wxT( "iso8859-15" ),
wxT( "koi8-r" ),
wxT( "windows1250" ),
wxT( "windows1251" ),
wxT( "windows1252" ),
wxT( "windows1253" ),
wxT( "windows1254" ),
wxT( "windows1255" ),
wxT( "windows1256" ),
wxT( "windows1257" ),
wxT( "windows437" ),
wxT( "windows-1250" ),
wxT( "windows-1251" ),
wxT( "windows-1252" ),
wxT( "windows-1253" ),
wxT( "windows-1254" ),
wxT( "windows-1255" ),
wxT( "windows-1256" ),
wxT( "windows-1257" ),
wxT( "windows-437" ),
};
// ----------------------------------------------------------------------------
@@ -438,10 +438,14 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
}
}
}
else if ( cs.Left(8) == wxT("WINDOWS-") )
else if ( cs.Left(7) == wxT("WINDOWS") )
{
const wxChar *p = cs.c_str() + 7;
if ( *p == wxT('-') )
p++;
int value;
if ( wxSscanf(cs.c_str() + 8, wxT("%u"), &value) == 1 )
if ( wxSscanf(p, wxT("%u"), &value) == 1 )
{
if ( value >= 1250 )
{