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

Limit LOCALE_SNAME avoidance to VS2010

Browse Source
This commit is contained in:
JulianSmart
2017-05-30 19:23:03 +01:00
parent 9af43c8c06
commit f14d702e4a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/intl.cpp
View File

@@ -151,9 +151,11 @@ wxString wxLanguageInfo::GetLocaleName() const
wxChar buffer[256]; wxChar buffer[256];
buffer[0] = wxT('\0'); buffer[0] = wxT('\0');
// wxLANGUAGE_NORWEGIAN_BOKMAL crashes mbstowcs, but using LOCALE_SNAME can fail // wxLANGUAGE_NORWEGIAN_BOKMAL crashes mbstowcs, but using LOCALE_SNAME can fail
// for e.g. wxLANGUAGE_ENGLISH, so at least limit the damage. // for e.g. wxLANGUAGE_ENGLISH in VS 2010 (other versions?)
if ( Language == wxLANGUAGE_NORWEGIAN_BOKMAL && wxGetWinVersion() >= wxWinVersion_Vista ) #if !defined(__VISUALC__) || (__VISUALC__ != 1600)
if ( wxGetWinVersion() >= wxWinVersion_Vista )
{ {
if ( ::GetLocaleInfo(lcid, LOCALE_SNAME, buffer, WXSIZEOF(buffer)) ) if ( ::GetLocaleInfo(lcid, LOCALE_SNAME, buffer, WXSIZEOF(buffer)) )
{ {
@@ -165,6 +167,7 @@ wxString wxLanguageInfo::GetLocaleName() const
} }
return locale; return locale;
} }
#endif
if ( !::GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, WXSIZEOF(buffer)) ) if ( !::GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, WXSIZEOF(buffer)) )
{ {