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

Add SetThreadUILanguage() wrapper

Browse Source 
Make it possible to reuse the code dynamically loading this function
from elsewhere.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-03-02 18:03:30 +01:00
parent 9600c29ff2
commit 9c4ab145e9
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/intl.cpp
View File

@@ -446,6 +446,28 @@ static const char *wxSetlocaleTryAll(int c, const wxString& lc)
#endif // __UNIX__ #endif // __UNIX__
#ifdef __WIN32__
// Trivial wrapper for ::SetThreadUILanguage().
//
// TODO-XP: Drop this when we don't support XP any longer.
static void wxMSWSetThreadUILanguage(LANGID langid)
{
// SetThreadUILanguage() is available on XP, but with unclear
// behavior, so avoid calling it there.
if ( wxGetWinVersion() >= wxWinVersion_Vista )
{
wxLoadedDLL dllKernel32(wxS("kernel32.dll"));
typedef LANGID(WINAPI *SetThreadUILanguage_t)(LANGID);
SetThreadUILanguage_t pfnSetThreadUILanguage = NULL;
wxDL_INIT_FUNC(pfn, SetThreadUILanguage, dllKernel32);
if (pfnSetThreadUILanguage)
pfnSetThreadUILanguage(langid);
}
}
#endif // __WIN32__
bool wxLocale::Init(int lang, int flags) bool wxLocale::Init(int lang, int flags)
{ {
#if WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
@@ -544,17 +566,7 @@ bool wxLocale::Init(int lang, int flags)
// change locale used by Windows functions // change locale used by Windows functions
::SetThreadLocale(lcid); ::SetThreadLocale(lcid);
// SetThreadUILanguage() is available on XP, but with unclear wxMSWSetThreadUILanguage(LANGIDFROMLCID(lcid));
// behavior, so avoid calling it there.
if ( wxGetWinVersion() >= wxWinVersion_Vista )
{
wxLoadedDLL dllKernel32(wxS("kernel32.dll"));
typedef LANGID(WINAPI *SetThreadUILanguage_t)(LANGID);
SetThreadUILanguage_t pfnSetThreadUILanguage = NULL;
wxDL_INIT_FUNC(pfn, SetThreadUILanguage, dllKernel32);
if (pfnSetThreadUILanguage)
pfnSetThreadUILanguage(LANGIDFROMLCID(lcid));
}
// and also call setlocale() to change locale used by the CRT // and also call setlocale() to change locale used by the CRT
retloc = info->TrySetLocale(); retloc = info->TrySetLocale();