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
This commit is contained in:
parent
ca08b543ec
commit
7ecb75b78e
@ -446,6 +446,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
|||||||
#else
|
#else
|
||||||
if (encName.empty())
|
if (encName.empty())
|
||||||
encName = _T("UTF-8");
|
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
|
#endif // wxUSE_INTL
|
||||||
static wxConvBrokenFileNames fileconv(encName);
|
static wxConvBrokenFileNames fileconv(encName);
|
||||||
wxConvFileName = &fileconv;
|
wxConvFileName = &fileconv;
|
||||||
|
Loading…
Reference in New Issue
Block a user