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

Move G_FILENAME_ENCODING to wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-04-13 20:05:57 +00:00
parent 3089a807e0
commit 845905d588
6 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/strconv.cpp
View File

@@ -363,38 +363,13 @@ size_t wxMBConvLibc::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// wxConvBrokenFileNames
// ----------------------------------------------------------------------------
wxConvBrokenFileNames::wxConvBrokenFileNames()
wxConvBrokenFileNames::wxConvBrokenFileNames(const wxChar *charset)
{
// decide which conversion to use for the file names
// (1) this variable exists for the sole purpose of specifying the encoding
// of the filenames for GTK+ programs, so use it if it is set
wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
encName.MakeUpper();
if ( !encName.empty() && encName != _T("UTF-8") && encName != _T("UTF8") )
{
m_conv = new wxCSConv(encName);
}
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 wxCSConv(encName);
}
else
{
// (3) finally use UTF-8 by default
m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
}
}
if ( !charset || wxStricmp(charset, _T("UTF-8")) == 0
|| wxStricmp(charset, _T("UTF8")) == 0 )
m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
else
m_conv = new wxCSConv(charset);
}
size_t