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

making sure unknown charsets are not defaulting to a valid system default

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-18 20:49:38 +00:00
parent 5d19459c0f
commit 40948a5a6c
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/strconv.cpp
View File

@@ -2735,7 +2735,8 @@ public:
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
wxMBConv_mac(const wxChar* name) wxMBConv_mac(const wxChar* name)
{ {
Init( wxMacGetSystemEncFromFontEnc( wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ); wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false);
Init( (enc != wxFONTENCODING_SYSTEM) ? wxMacGetSystemEncFromFontEnc( enc ) : kTextEncodingUnknown);
} }
#endif #endif
@@ -2758,13 +2759,22 @@ public:
{ {
m_MB2WC_converter = NULL ; m_MB2WC_converter = NULL ;
m_WC2MB_converter = NULL ; m_WC2MB_converter = NULL ;
m_char_encoding = CreateTextEncoding(encoding, encodingVariant, encodingFormat) ; if ( encoding != kTextEncodingUnknown )
m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, 0, kUnicode16BitFormat) ; {
m_char_encoding = CreateTextEncoding(encoding, encodingVariant, encodingFormat) ;
m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, 0, kUnicode16BitFormat) ;
}
else
{
m_char_encoding = kTextEncodingUnknown;
m_unicode_encoding = kTextEncodingUnknown;
}
} }
virtual void CreateIfNeeded() const virtual void CreateIfNeeded() const
{ {
if ( m_MB2WC_converter == NULL && m_WC2MB_converter == NULL ) if ( m_MB2WC_converter == NULL && m_WC2MB_converter == NULL &&
m_char_encoding != kTextEncodingUnknown && m_unicode_encoding != kTextEncodingUnknown )
{ {
OSStatus status = noErr ; OSStatus status = noErr ;
status = TECCreateConverter(&m_MB2WC_converter, status = TECCreateConverter(&m_MB2WC_converter,