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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-19 01:34:36 +00:00
parent 55bef83fe0
commit c64b101c34
1 changed files with 1 additions and 1 deletions
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3506,7 +3506,7 @@ void wxCSConv::CreateConvIfNeeded() const
        if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
        {
 #if wxUSE_INTL
-            self->m_name = wxStrdup(wxLocale::GetSystemEncodingName());
+            self->m_encoding = wxLocale::GetSystemEncoding();
 #else
            // fallback to some reasonable default:
            self->m_encoding = wxFONTENCODING_ISO8859_1;