Support for G_FILENAME_ENCODING=@locale

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index c9f166377f5dc95300caf10205f7233323d08b04..8932e2198d6f5b3b3e6e9f58a4ce1964be17fa56 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -612,6 +612,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // (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")));
+    if (encName == _T("@locale"))
+        encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL        
     if (encName.empty())

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index c9f166377f5dc95300caf10205f7233323d08b04..8932e2198d6f5b3b3e6e9f58a4ce1964be17fa56 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -612,6 +612,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // (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")));
+    if (encName == _T("@locale"))
+        encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL        
     if (encName.empty())