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

set m_encoding in wxCSConv ctor from name

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-02-09 14:58:08 +00:00
parent 006b8dff84
commit e4277538a5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/strconv.cpp
View File

@@ -2462,7 +2462,11 @@ wxCSConv::wxCSConv(const wxChar *charset)
SetName(charset); SetName(charset);
} }
#if wxUSE_FONTMAP
m_encoding = wxFontMapperBase::GetEncodingFromName(charset);
#else
m_encoding = wxFONTENCODING_SYSTEM; m_encoding = wxFONTENCODING_SYSTEM;
#endif
} }
wxCSConv::wxCSConv(wxFontEncoding encoding) wxCSConv::wxCSConv(wxFontEncoding encoding)
@@ -2542,7 +2546,8 @@ wxMBConv *wxCSConv::DoCreate() const
// check for the special case of ASCII or ISO8859-1 charset: as we have // check for the special case of ASCII or ISO8859-1 charset: as we have
// special knowledge of it anyhow, we don't need to create a special // special knowledge of it anyhow, we don't need to create a special
// conversion object // conversion object
if ( m_encoding == wxFONTENCODING_ISO8859_1 ) if ( m_encoding == wxFONTENCODING_ISO8859_1 ||
m_encoding == wxFONTENCODING_DEFAULT )
{ {
// don't convert at all // don't convert at all
return NULL; return NULL;