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

Recognize system UTF-8 encoding under MSW too

Browse Source 
Recent versions of Windows 10 (finally!) allow to set up UTF-8 as the
system encoding, so recognize when it is returned by GetACP() in
wxLocale::GetSystemEncoding() and GetSystemEncodingName().
This commit is contained in:
Vadim Zeitlin
2019-09-27 19:34:32 +02:00
parent 7feaa024b3
commit 194870fe5e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/intl.cpp
View File

@@ -825,8 +825,16 @@ wxString wxLocale::GetSystemEncodingName()
#if defined(__WIN32__) #if defined(__WIN32__)
// FIXME: what is the error return value for GetACP()? // FIXME: what is the error return value for GetACP()?
UINT codepage = ::GetACP(); const UINT codepage = ::GetACP();
encname.Printf(wxS("windows-%u"), codepage); switch ( codepage )
{
case 65001:
encname = "UTF-8";
break;
default:
encname.Printf(wxS("windows-%u"), codepage);
}
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
encname = wxCFStringRef::AsString( encname = wxCFStringRef::AsString(
CFStringGetNameOfEncoding(CFStringGetSystemEncoding()) CFStringGetNameOfEncoding(CFStringGetSystemEncoding())
@@ -909,6 +917,9 @@ wxFontEncoding wxLocale::GetSystemEncoding()
case 950: case 950:
return wxFONTENCODING_CP950; return wxFONTENCODING_CP950;
case 65001:
return wxFONTENCODING_UTF8;
} }
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
CFStringEncoding encoding = 0 ; CFStringEncoding encoding = 0 ;