From d24b23b76eca69c0faecf6146f52f6d8f93d4b78 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Thu, 21 Apr 2005 23:11:44 +0000 Subject: [PATCH] Support for G_FILENAME_ENCODING=@locale git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/app.cpp | 2 ++ src/gtk1/app.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index c9f166377f..8932e2198d 100644 --- 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 c9f166377f..8932e2198d 100644 --- 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()) -- 2.45.2