add the mac specific encodings correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2396,7 +2396,9 @@ wxMBConv *wxCSConv::DoCreate() const
|
|||||||
#endif // wxHAVE_WIN32_MB2WC
|
#endif // wxHAVE_WIN32_MB2WC
|
||||||
#if defined(__WXMAC__)
|
#if defined(__WXMAC__)
|
||||||
{
|
{
|
||||||
if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ) )
|
// leave UTF16 and UTF32 to the built-ins of wx
|
||||||
|
if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
|
||||||
|
( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
#if wxUSE_FONTMAP
|
#if wxUSE_FONTMAP
|
||||||
|
Reference in New Issue
Block a user