From: Vadim Zeitlin Date: Tue, 20 Mar 2007 13:29:36 +0000 (+0000) Subject: prevent GTK+ from changing locale when wxUSE_INTL==0, this makes the behaviour consis... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7ecb75b78ec24e0e38555873a000527ca9f16766 prevent GTK+ from changing locale when wxUSE_INTL==0, this makes the behaviour consistent with the other ports in this case too (and not only when wxUSE_INTL==1 and the locale is changed (in all ports)) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 406729696f..fa47355e8f 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -446,6 +446,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #else if (encName.empty()) encName = _T("UTF-8"); + + // if wxUSE_INTL==0 it probably indicates that only "C" locale is supported + // by the program anyhow so prevent GTK+ from calling setlocale(LC_ALL, "") + // from gtk_init_check() as it does by default + gtk_disable_setlocale(); + #endif // wxUSE_INTL static wxConvBrokenFileNames fileconv(encName); wxConvFileName = &fileconv;