wxBase compilation fix for Mac, with help from Ryan

[wxWidgets.git] / src / common / strconv.cpp

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 9df03b339f385a1892154d6ef082932e9ab7b7f3..88e49338d756679cd9696d859e6afdd8f4bd3064 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -363,36 +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 ( encName.empty() )
-            encName = wxLocale::GetSystemEncodingName().Upper();
-
-        // (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;
-        }
-        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