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

Fix wxLocale::GetInfo() for unknown Windows locales

Browse Source 
wxWidgets may be unaware of the locale being used and may be unable to
get correct information from its languages database. For example, en-AT
locale, supported by Windows 10 and using "," for decimal point, would
be interpreted as en-US by wx, and return "." here.

The other situation, when wx supports a locale that the OS doesn't,
shouldn't make a difference here because in that case, CRT wouldn't
support the locale either and CRT formatting functions wouldn't be set
to use it.

See also somewhat related 9fc78c8167.
This commit is contained in:
Václav Slavík
2021-04-16 19:53:04 +02:00
parent 1c15e05260
commit c9e2143a7a
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/intl.cpp
View File

@@ -1688,10 +1688,7 @@ GetInfoFromLCID(LCID lcid,
/* static */ /* static */
wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat) wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
{ {
const wxLanguageInfo * const if ( !wxGetLocale() )
info = wxGetLocale() ? GetLanguageInfo(wxGetLocale()->GetLanguage())
: NULL;
if ( !info )
{ {
// wxSetLocale() hadn't been called yet of failed, hence CRT must be // wxSetLocale() hadn't been called yet of failed, hence CRT must be
// using "C" locale -- but check it to detect bugs that would happen if // using "C" locale -- but check it to detect bugs that would happen if
@@ -1734,7 +1731,8 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
} }
} }
return GetInfoFromLCID(info->GetLCID(), index, cat); // wxSetLocale() succeeded and so thread locale was set together with CRT one.
return GetInfoFromLCID(::GetThreadLocale(), index, cat);
} }
/* static */ /* static */