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

backport fix for wxCSConv(wxFONTENCODING_SYSTEM) creation from trunk: use system encoding for DoCreate(), not name which is not handled correctly for ASCII case

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-19 01:34:36 +00:00
parent 55bef83fe0
commit c64b101c34
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/strconv.cpp
View File

@@ -3506,7 +3506,7 @@ void wxCSConv::CreateConvIfNeeded() const
if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM ) if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
{ {
#if wxUSE_INTL #if wxUSE_INTL
self->m_name = wxStrdup(wxLocale::GetSystemEncodingName()); self->m_encoding = wxLocale::GetSystemEncoding();
#else #else
// fallback to some reasonable default: // fallback to some reasonable default:
self->m_encoding = wxFONTENCODING_ISO8859_1; self->m_encoding = wxFONTENCODING_ISO8859_1;