From c64b101c3424c35626e2ea3f4f2ff04a8d92974c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Jul 2008 01:34:36 +0000 Subject: [PATCH] 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 --- src/common/strconv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 10577d1c53..391b1e1e87 100644 --- 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;