fixed bug in wxCSConv(encoding) ctor (which I just added)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -883,8 +883,8 @@ wxGetCharacterSet(const wxChar *name, wxFontEncoding encoding)
|
|||||||
// check for the special case of ASCII charset
|
// check for the special case of ASCII charset
|
||||||
if ( (!name && encoding == wxFONTENCODING_DEFAULT)
|
if ( (!name && encoding == wxFONTENCODING_DEFAULT)
|
||||||
#if wxUSE_FONTMAP
|
#if wxUSE_FONTMAP
|
||||||
|| wxFontMapper::Get()->
|
|| (name && wxFontMapper::Get()->
|
||||||
CharsetToEncoding(name) == wxFONTENCODING_DEFAULT
|
CharsetToEncoding(name) == wxFONTENCODING_DEFAULT)
|
||||||
#endif // wxUSE_FONTMAP
|
#endif // wxUSE_FONTMAP
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user