From ecffe99226f1f13659cdc965b5b5d18692fd25f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Tue, 12 Jun 2001 22:53:38 +0000
Subject: [PATCH] standardized encoding names to windows-12xx and iso-8859-x
 forms

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/fontmap.cpp | 30 +++++++++++++++---------------
 src/common/intl.cpp    |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index c63b9af1c4..6f1570ed81 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -132,21 +132,21 @@ static const wxChar* gs_encodingDescs[] =
 // and the internal names
 static const wxChar* gs_encodingNames[] =
 {
-    wxT( "iso8859-1" ),
-    wxT( "iso8859-2" ),
-    wxT( "iso8859-3" ),
-    wxT( "iso8859-4" ),
-    wxT( "iso8859-5" ),
-    wxT( "iso8859-6" ),
-    wxT( "iso8859-7" ),
-    wxT( "iso8859-8" ),
-    wxT( "iso8859-9" ),
-    wxT( "iso8859-10" ),
-    wxT( "iso8859-11" ),
-    wxT( "iso8859-12" ),
-    wxT( "iso8859-13" ),
-    wxT( "iso8859-14" ),
-    wxT( "iso8859-15" ),
+    wxT( "iso-8859-1" ),
+    wxT( "iso-8859-2" ),
+    wxT( "iso-8859-3" ),
+    wxT( "iso-8859-4" ),
+    wxT( "iso-8859-5" ),
+    wxT( "iso-8859-6" ),
+    wxT( "iso-8859-7" ),
+    wxT( "iso-8859-8" ),
+    wxT( "iso-8859-9" ),
+    wxT( "iso-8859-10" ),
+    wxT( "iso-8859-11" ),
+    wxT( "iso-8859-12" ),
+    wxT( "iso-8859-13" ),
+    wxT( "iso-8859-14" ),
+    wxT( "iso-8859-15" ),
     wxT( "koi8-r" ),
     wxT( "windows-1250" ),
     wxT( "windows-1251" ),
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 01d449fd53..4fb77495a0 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -932,7 +932,7 @@ wxString wxLocale::GetSystemEncodingName()
 #ifdef __WIN32__
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
-    encname.Printf(_T("cp%u"), codepage);
+    encname.Printf(_T("windows-%u"), codepage);
 #elif defined(__UNIX_LIKE__)
 
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
-- 
2.45.2