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

applied patch #103444

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-02-02 16:53:08 +00:00
parent ffdd3c9861
commit 03424b1b89
3 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/font/font.cpp
View File

@@ -391,15 +391,15 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
static const wxString encodingNames[] = static const wxString encodingNames[] =
{ {
"West European (Latin 1)", "Western European (ISO-8859-1)",
"Central European (Latin 2)", "Central European (ISO-8859-2)",
"Cyrillic (Latin 5)", "Cyrillic (ISO-8859-5)",
"Greek (Latin 7)", "Greek (ISO-8859-7)",
"West European new (Latin 0)", "Western European with Euro (ISO-8859-15)",
"KOI8-R", "KOI8-R",
"Windows Latin 2", "Windows Central European (CP 1250)",
"Windows Cyrillic", "Windows Cyrillic (CP 1251)",
"Windows Latin 1", "Windows Western European (CP 1252)",
}; };
int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo", int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",

4
src/common/encconv.cpp
View File

@@ -301,7 +301,7 @@ static wxFontEncoding
// *** Please put more common encodings as first! *** // *** Please put more common encodings as first! ***
// West European // Western European
{ {
/* unix */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP}, /* unix */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
/* windows */ {wxFONTENCODING_CP1252, STOP}, /* windows */ {wxFONTENCODING_CP1252, STOP},
@@ -319,7 +319,7 @@ static wxFontEncoding
// Baltic // Baltic
{ {
/* unix */ {wxFONTENCODING_ISO8859_13, STOP}, /* unix */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP},
/* windows */ {wxFONTENCODING_CP1257, STOP}, /* windows */ {wxFONTENCODING_CP1257, STOP},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}

8
src/common/fontmap.cpp
View File

@@ -95,11 +95,11 @@ static wxFontEncoding gs_encodings[] =
// the descriptions for them // the descriptions for them
static const wxChar* gs_encodingDescs[] = static const wxChar* gs_encodingDescs[] =
{ {
wxTRANSLATE( "Western European (ISO-8859-1/Latin 1)" ), wxTRANSLATE( "Western European (ISO-8859-1)" ),
wxTRANSLATE( "Central European (ISO-8859-2/Latin 2)" ), wxTRANSLATE( "Central European (ISO-8859-2)" ),
wxTRANSLATE( "Esperanto (ISO-8859-3)" ), wxTRANSLATE( "Esperanto (ISO-8859-3)" ),
wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ), wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ),
wxTRANSLATE( "Cyrillic (Latin 5)" ), wxTRANSLATE( "Cyrillic (ISO-8859-5)" ),
wxTRANSLATE( "Arabic (ISO-8859-6)" ), wxTRANSLATE( "Arabic (ISO-8859-6)" ),
wxTRANSLATE( "Greek (ISO-8859-7)" ), wxTRANSLATE( "Greek (ISO-8859-7)" ),
wxTRANSLATE( "Hebrew (ISO-8859-8)" ), wxTRANSLATE( "Hebrew (ISO-8859-8)" ),
@@ -109,7 +109,7 @@ static const wxChar* gs_encodingDescs[] =
wxTRANSLATE( "Indian (ISO-8859-12)" ), wxTRANSLATE( "Indian (ISO-8859-12)" ),
wxTRANSLATE( "Baltic (ISO-8859-13)" ), wxTRANSLATE( "Baltic (ISO-8859-13)" ),
wxTRANSLATE( "Celtic (ISO-8859-14)" ), wxTRANSLATE( "Celtic (ISO-8859-14)" ),
wxTRANSLATE( "Western European with Euro (ISO-8859-15/Latin 0)" ), wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ),
wxTRANSLATE( "KOI8-R" ), wxTRANSLATE( "KOI8-R" ),
wxTRANSLATE( "Windows Central European (CP 1250)" ), wxTRANSLATE( "Windows Central European (CP 1250)" ),
wxTRANSLATE( "Windows Cyrillic (CP 1251)" ), wxTRANSLATE( "Windows Cyrillic (CP 1251)" ),