Shouldn't the fontmapper recognize 8859 as iso-8859?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -557,6 +557,27 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if ( cs.Left(4) == wxT("8859") )
|
||||||
|
{
|
||||||
|
const wxChar *p = cs.c_str();
|
||||||
|
|
||||||
|
unsigned int value;
|
||||||
|
if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
|
||||||
|
{
|
||||||
|
// printf( "value %d\n", (int)value );
|
||||||
|
|
||||||
|
// make it 0 based and check that it is strictly positive in
|
||||||
|
// the process (no such thing as iso8859-0 encoding)
|
||||||
|
if ( (value-- > 0) &&
|
||||||
|
(value < wxFONTENCODING_ISO8859_MAX -
|
||||||
|
wxFONTENCODING_ISO8859_1) )
|
||||||
|
{
|
||||||
|
// it's a valid ISO8859 encoding
|
||||||
|
value += wxFONTENCODING_ISO8859_1;
|
||||||
|
encoding = (wxFontEncoding)value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
else // check for Windows charsets
|
else // check for Windows charsets
|
||||||
{
|
{
|
||||||
size_t len;
|
size_t len;
|
||||||
|
Reference in New Issue
Block a user