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

standardized encoding names to windows-12xx and iso-8859-x forms

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-06-12 22:53:38 +00:00
parent b7fa390b64
commit ecffe99226
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/fontmap.cpp
View File

@@ -132,21 +132,21 @@ static const wxChar* gs_encodingDescs[] =
// and the internal names // and the internal names
static const wxChar* gs_encodingNames[] = static const wxChar* gs_encodingNames[] =
{ {
wxT( "iso8859-1" ), wxT( "iso-8859-1" ),
wxT( "iso8859-2" ), wxT( "iso-8859-2" ),
wxT( "iso8859-3" ), wxT( "iso-8859-3" ),
wxT( "iso8859-4" ), wxT( "iso-8859-4" ),
wxT( "iso8859-5" ), wxT( "iso-8859-5" ),
wxT( "iso8859-6" ), wxT( "iso-8859-6" ),
wxT( "iso8859-7" ), wxT( "iso-8859-7" ),
wxT( "iso8859-8" ), wxT( "iso-8859-8" ),
wxT( "iso8859-9" ), wxT( "iso-8859-9" ),
wxT( "iso8859-10" ), wxT( "iso-8859-10" ),
wxT( "iso8859-11" ), wxT( "iso-8859-11" ),
wxT( "iso8859-12" ), wxT( "iso-8859-12" ),
wxT( "iso8859-13" ), wxT( "iso-8859-13" ),
wxT( "iso8859-14" ), wxT( "iso-8859-14" ),
wxT( "iso8859-15" ), wxT( "iso-8859-15" ),
wxT( "koi8-r" ), wxT( "koi8-r" ),
wxT( "windows-1250" ), wxT( "windows-1250" ),
wxT( "windows-1251" ), wxT( "windows-1251" ),

2
src/common/intl.cpp
View File

@@ -932,7 +932,7 @@ wxString wxLocale::GetSystemEncodingName()
#ifdef __WIN32__ #ifdef __WIN32__
// FIXME: what is the error return value for GetACP()? // FIXME: what is the error return value for GetACP()?
UINT codepage = ::GetACP(); UINT codepage = ::GetACP();
encname.Printf(_T("cp%u"), codepage); encname.Printf(_T("windows-%u"), codepage);
#elif defined(__UNIX_LIKE__) #elif defined(__UNIX_LIKE__)
#if defined(HAVE_LANGINFO_H) && defined(CODESET) #if defined(HAVE_LANGINFO_H) && defined(CODESET)