From 46f2e76b49d8b90ac24b2e00033aa525ac91aadc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Jun 2000 15:10:04 +0000 Subject: [PATCH] corrected Baltic encoding handling (patch from Nerijus ) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/fontenc.h | 4 ++-- src/common/fontmap.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h index a6163440b2..83300a6f40 100644 --- a/include/wx/fontenc.h +++ b/include/wx/fontenc.h @@ -22,7 +22,7 @@ enum wxFontEncoding wxFONTENCODING_ISO8859_1, // West European (Latin1) wxFONTENCODING_ISO8859_2, // Central and East European (Latin2) wxFONTENCODING_ISO8859_3, // Esperanto (Latin3) - wxFONTENCODING_ISO8859_4, // Baltic languages (Estonian) (Latin4) + wxFONTENCODING_ISO8859_4, // Baltic (old) (Latin4) wxFONTENCODING_ISO8859_5, // Cyrillic wxFONTENCODING_ISO8859_6, // Arabic wxFONTENCODING_ISO8859_7, // Greek @@ -33,7 +33,7 @@ enum wxFontEncoding wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it // here anyhow to make all ISO8859 // consecutive numbers - wxFONTENCODING_ISO8859_13, // Latin7 + wxFONTENCODING_ISO8859_13, // Baltic (Latin7) wxFONTENCODING_ISO8859_14, // Latin8 wxFONTENCODING_ISO8859_15, // Latin9 (a.k.a. Latin0, includes euro) wxFONTENCODING_ISO8859_MAX, diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index 1d0676ef20..15872c1912 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -97,16 +97,16 @@ static const wxChar* gs_encodingDescs[] = wxTRANSLATE( "West European (ISO-8859-1/Latin 1)" ), wxTRANSLATE( "Central European (ISO-8859-2/Latin 2)" ), wxTRANSLATE( "Esperanto (ISO-8859-3)" ), - wxTRANSLATE( "Baltic (ISO-8859-4)" ), + wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ), wxTRANSLATE( "Cyrillic (Latin 5)" ), wxTRANSLATE( "Arabic (ISO-8859-6)" ), wxTRANSLATE( "Greek (ISO-8859-7)" ), wxTRANSLATE( "Hebrew (ISO-8859-8)" ), wxTRANSLATE( "Turkish (ISO-8859-9)" ), - wxTRANSLATE( "Baltic II (ISO-8859-10)" ), + wxTRANSLATE( "Nordic (ISO-8859-10)" ), wxTRANSLATE( "Thai (ISO-8859-11)" ), wxTRANSLATE( "ISO-8859-12" ), - wxTRANSLATE( "ISO-8859-13" ), + wxTRANSLATE( "Baltic (ISO-8859-13)" ), wxTRANSLATE( "ISO-8859-14" ), wxTRANSLATE( "West European new (ISO-8859-15/Latin 0)" ), wxTRANSLATE( "KOI8-R" ),