Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't call gtk_disable_setlocale() more than once

Browse Source 
This is useless and just results in GTK warnings.
This commit is contained in:
Vadim Zeitlin
2020-02-06 15:59:45 +01:00
parent 5663157674
commit a2b39f782b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/app.cpp
View File

@@ -356,7 +356,15 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
// Prevent gtk_init_check() from changing the locale automatically for // Prevent gtk_init_check() from changing the locale automatically for
// consistency with the other ports that don't do it. If necessary, // consistency with the other ports that don't do it. If necessary,
// wxApp::SetCLocale() may be explicitly called. // wxApp::SetCLocale() may be explicitly called.
gtk_disable_setlocale(); //
// Note that this function generates a warning if it's called more than
// once, so avoid them.
static bool s_gtkLocalDisabled = false;
if ( !s_gtkLocalDisabled )
{
s_gtkLocalDisabled = true;
gtk_disable_setlocale();
}
#ifdef __WXGPE__ #ifdef __WXGPE__
init_result = true; // is there a _check() version of this? init_result = true; // is there a _check() version of this?