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

Only set wxLocale as active once it has been fully initialized

Browse Source 
Previously wxLocale object was set as the global local as soon as it was
created, even when the default ctor was used, i.e. the locale wasn't
really changed at all. This was always wrong, but only started to result
in visible problems since the changes of c6d6ec9295 (Merge branch
'msw-fix-decimal-point' of https://github.com/vslavik/wxWidgets,
2021-04-18) as we now could use the existing but not yet active locale
when checking for the decimal separator mismatch, resulting in spurious
asserts.

Fix this by postponing the call to wxSetLocale() and the rest of what
was previously done in the ctor until Init() is called (which is done by
all non default ctors).

Closes https://github.com/wxWidgets/wxWidgets/pull/2350

Closes #19154.
This commit is contained in:
Vadim Zeitlin
2021-04-26 11:59:43 +01:00
parent 17e0f23cd0
commit 1c8af332cf
2 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/common/intl.cpp
View File

@@ -248,36 +248,15 @@ wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
void wxLocale::DoCommonInit()
{
// Store the current locale in order to be able to restore it in the dtor.
m_pszOldLocale = wxSetlocale(LC_ALL, NULL);
if ( m_pszOldLocale )
m_pszOldLocale = wxStrdup(m_pszOldLocale);
m_language = wxLANGUAGE_UNKNOWN;
m_pszOldLocale = NULL;
m_pOldLocale = NULL;
#ifdef __WIN32__
m_oldLCID = ::GetThreadLocale();
m_oldLCID = 0;
#endif
m_pOldLocale = wxSetLocale(this);
// Set translations object, but only if the user didn't do so yet.
// This is to preserve compatibility with wx-2.8 where wxLocale was
// the only API for translations. wxLocale works as a stack, with
// latest-created one being the active one:
// wxLocale loc_fr(wxLANGUAGE_FRENCH);
// // _() returns French
// {
// wxLocale loc_cs(wxLANGUAGE_CZECH);
// // _() returns Czech
// }
// // _() returns French again
wxTranslations *oldTrans = wxTranslations::Get();
if ( !oldTrans ||
(m_pOldLocale && oldTrans == &m_pOldLocale->m_translations) )
{
wxTranslations::SetNonOwned(&m_translations);
}
m_language = wxLANGUAGE_UNKNOWN;
m_initialized = false;
}
@@ -356,6 +335,35 @@ void wxLocale::DoInit(const wxString& name,
m_strLocale = name;
m_strShort = shortName;
m_language = language;
// Store the current locale in order to be able to restore it in the dtor.
m_pszOldLocale = wxSetlocale(LC_ALL, NULL);
if ( m_pszOldLocale )
m_pszOldLocale = wxStrdup(m_pszOldLocale);
#ifdef __WIN32__
m_oldLCID = ::GetThreadLocale();
#endif
m_pOldLocale = wxSetLocale(this);
// Set translations object, but only if the user didn't do so yet.
// This is to preserve compatibility with wx-2.8 where wxLocale was
// the only API for translations. wxLocale works as a stack, with
// latest-created one being the active one:
// wxLocale loc_fr(wxLANGUAGE_FRENCH);
// // _() returns French
// {
// wxLocale loc_cs(wxLANGUAGE_CZECH);
// // _() returns Czech
// }
// // _() returns French again
wxTranslations *oldTrans = wxTranslations::Get();
if ( !oldTrans ||
(m_pOldLocale && oldTrans == &m_pOldLocale->m_translations) )
{
wxTranslations::SetNonOwned(&m_translations);
}
}
bool wxLocale::DoCommonPostInit(bool success,
@@ -1082,6 +1090,11 @@ wxString wxLocale::GetSysName() const
// clean up
wxLocale::~wxLocale()
{
// Nothing here needs to be done if the object had never been initialized
// successfully.
if ( !m_initialized )
return;
// Restore old translations object.
// See DoCommonInit() for explanation of why this is needed for backward
// compatibility.