From 4fdc08274b30ed1db62a22522d40fd2343d932e2 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Wed, 13 Apr 2005 12:37:53 +0000 Subject: [PATCH] Compilo fix for wxUSE_INTL=0 and use wxCSConv for broken filenames instead of wxMBConvLibc git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/strconv.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 9df03b339f..69fc4a8126 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -377,15 +377,17 @@ wxConvBrokenFileNames::wxConvBrokenFileNames() } else // no G_FILENAME_ENCODING { +#if wxUSE_INTL if ( encName.empty() ) encName = wxLocale::GetSystemEncodingName().Upper(); +#endif // (2) if a non default locale is set, assume that the user wants his // filenames in this locale too if ( !encName.empty() && encName != _T("UTF-8") && encName != _T("UTF8") ) { wxSetEnv(_T("G_FILENAME_ENCODING"), encName); - m_conv = new wxMBConvLibc; + m_conv = new wxCSConv(encName); } else { -- 2.50.0