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

Compilo fix for wxUSE_INTL=0 and use wxCSConv for broken filenames instead of wxMBConvLibc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-04-13 12:37:53 +00:00
parent 4817190d09
commit 4fdc08274b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/strconv.cpp
View File

@@ -377,15 +377,17 @@ wxConvBrokenFileNames::wxConvBrokenFileNames()
} }
else // no G_FILENAME_ENCODING else // no G_FILENAME_ENCODING
{ {
#if wxUSE_INTL
if ( encName.empty() ) if ( encName.empty() )
encName = wxLocale::GetSystemEncodingName().Upper(); encName = wxLocale::GetSystemEncodingName().Upper();
#endif
// (2) if a non default locale is set, assume that the user wants his // (2) if a non default locale is set, assume that the user wants his
// filenames in this locale too // filenames in this locale too
if ( !encName.empty() && encName != _T("UTF-8") && encName != _T("UTF8") ) if ( !encName.empty() && encName != _T("UTF-8") && encName != _T("UTF8") )
{ {
wxSetEnv(_T("G_FILENAME_ENCODING"), encName); wxSetEnv(_T("G_FILENAME_ENCODING"), encName);
m_conv = new wxMBConvLibc; m_conv = new wxCSConv(encName);
} }
else else
{ {