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",

94
src/common/encconv.cpp
View File

@@ -26,7 +26,7 @@
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#include "../common/unictabl.inc" #include "../common/unictabl.inc"
#else #else
#include "unictabl.inc" #include "unictabl.inc"
#endif #endif
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
@@ -39,7 +39,7 @@ static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
{ {
for (int i = 0; encodings_list[i].table != NULL; i++) for (int i = 0; encodings_list[i].table != NULL; i++)
{ {
if (encodings_list[i].encoding == enc) if (encodings_list[i].encoding == enc)
return encodings_list[i].table; return encodings_list[i].table;
} }
return NULL; return NULL;
@@ -61,12 +61,12 @@ static int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl) static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl)
{ {
CharsetItem *rev = new CharsetItem[128]; CharsetItem *rev = new CharsetItem[128];
for (int i = 0; i < 128; i++) for (int i = 0; i < 128; i++)
rev[i].c = 128 + i, rev[i].u = tbl[i]; rev[i].c = 128 + i, rev[i].u = tbl[i];
qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems); qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
return rev; return rev;
} }
@@ -93,17 +93,17 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
#endif #endif
if (input_enc == output_enc) {m_JustCopy = TRUE; return TRUE;} if (input_enc == output_enc) {m_JustCopy = TRUE; return TRUE;}
m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE); m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
m_JustCopy = FALSE; m_JustCopy = FALSE;
if (input_enc == wxFONTENCODING_UNICODE) if (input_enc == wxFONTENCODING_UNICODE)
{ {
if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE; if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
m_Table = new tchar[65536]; m_Table = new tchar[65536];
for (i = 0; i < 128; i++) m_Table[i] = (tchar)i; // 7bit ASCII for (i = 0; i < 128; i++) m_Table[i] = (tchar)i; // 7bit ASCII
for (i = 128; i < 65536; i++) m_Table[i] = (tchar)'?'; for (i = 128; i < 65536; i++) m_Table[i] = (tchar)'?';
// FIXME - this should be character that means `unicode to charset' impossible, not '?' // FIXME - this should be character that means `unicode to charset' impossible, not '?'
if (method == wxCONVERT_SUBSTITUTE) if (method == wxCONVERT_SUBSTITUTE)
@@ -118,7 +118,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
m_UnicodeInput = TRUE; m_UnicodeInput = TRUE;
return TRUE; return TRUE;
} }
else else
{ {
if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE; if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
@@ -126,33 +126,33 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE; if ((out_tbl = GetEncTable(output_enc)) == NULL) return FALSE;
m_UnicodeInput = FALSE; m_UnicodeInput = FALSE;
m_Table = new tchar[256]; m_Table = new tchar[256];
for (i = 0; i < 128; i++) m_Table[i] = (tchar)i; // 7bit ASCII for (i = 0; i < 128; i++) m_Table[i] = (tchar)i; // 7bit ASCII
if (output_enc == wxFONTENCODING_UNICODE) if (output_enc == wxFONTENCODING_UNICODE)
{ {
for (i = 0; i < 128; i++) m_Table[128 + i] = (tchar)in_tbl[i]; for (i = 0; i < 128; i++) m_Table[128 + i] = (tchar)in_tbl[i];
return TRUE; return TRUE;
} }
else else
{ {
CharsetItem *rev = BuildReverseTable(out_tbl); CharsetItem *rev = BuildReverseTable(out_tbl);
CharsetItem *item, key; CharsetItem *item, key;
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
{ {
key.u = in_tbl[i]; key.u = in_tbl[i];
item = (CharsetItem*) bsearch(&key, rev, 128, sizeof(CharsetItem), CompareCharsetItems); item = (CharsetItem*) bsearch(&key, rev, 128, sizeof(CharsetItem), CompareCharsetItems);
if (item == NULL && method == wxCONVERT_SUBSTITUTE) if (item == NULL && method == wxCONVERT_SUBSTITUTE)
item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback, item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems); encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
if (item) if (item)
m_Table[128 + i] = (tchar)item -> c; m_Table[128 + i] = (tchar)item -> c;
else else
m_Table[128 + i] = 128 + i; // don't know => don't touch m_Table[128 + i] = 128 + i; // don't know => don't touch
} }
delete[] rev; delete[] rev;
return TRUE; return TRUE;
} }
@@ -174,9 +174,9 @@ void wxEncodingConverter::Convert(const char* input, char* output)
strcpy(output, input); strcpy(output, input);
return; return;
} }
wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
for (i = input, o = output; *i != 0;) for (i = input, o = output; *i != 0;)
*(o++) = (char)(m_Table[(wxUint8)*(i++)]); *(o++) = (char)(m_Table[(wxUint8)*(i++)]);
*o = 0; *o = 0;
@@ -200,9 +200,9 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output)
*o = 0; *o = 0;
return; return;
} }
wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
for (i = input, o = output; *i != 0;) for (i = input, o = output; *i != 0;)
*(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]); *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
*o = 0; *o = 0;
@@ -225,9 +225,9 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output)
*o = 0; *o = 0;
return; return;
} }
wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
for (i = input, o = output; *i != 0;) for (i = input, o = output; *i != 0;)
*(o++) = (char)(m_Table[(wxUint16)*(i++)]); *(o++) = (char)(m_Table[(wxUint16)*(i++)]);
*o = 0; *o = 0;
@@ -251,9 +251,9 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
*o = 0; *o = 0;
return; return;
} }
wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
for (i = input, o = output; *i != 0;) for (i = input, o = output; *i != 0;)
*(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]); *(o++) = (wchar_t)(m_Table[(wxUint8)*(i++)]);
*o = 0; *o = 0;
@@ -265,12 +265,12 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
wxString wxEncodingConverter::Convert(const wxString& input) wxString wxEncodingConverter::Convert(const wxString& input)
{ {
if (m_JustCopy) return input; if (m_JustCopy) return input;
wxString s; wxString s;
const wxChar *i; const wxChar *i;
wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!")); wxASSERT_MSG(m_Table != NULL, wxT("You must call wxEncodingConverter::Init() before actually converting!"));
if (m_UnicodeInput) if (m_UnicodeInput)
for (i = input.c_str(); *i != 0; i++) for (i = input.c_str(); *i != 0; i++)
s << (wxChar)(m_Table[(wxUint16)*i]); s << (wxChar)(m_Table[(wxUint16)*i]);
@@ -287,7 +287,7 @@ wxString wxEncodingConverter::Convert(const wxString& input)
// Following tables describe classes of encoding equivalence. // Following tables describe classes of encoding equivalence.
// //
#define STOP wxFONTENCODING_SYSTEM #define STOP wxFONTENCODING_SYSTEM
@@ -296,17 +296,17 @@ wxString wxEncodingConverter::Convert(const wxString& input)
// max no. of encodings for one language used on one platform // max no. of encodings for one language used on one platform
// Anybody thinks 5 is not enough? ;-) // Anybody thinks 5 is not enough? ;-)
static wxFontEncoding static wxFontEncoding
EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = { EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
// *** 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},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}
}, },
// Central European // Central European
@@ -314,15 +314,15 @@ static wxFontEncoding
/* unix */ {wxFONTENCODING_ISO8859_2, STOP}, /* unix */ {wxFONTENCODING_ISO8859_2, STOP},
/* windows */ {wxFONTENCODING_CP1250, STOP}, /* windows */ {wxFONTENCODING_CP1250, STOP},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}
}, },
// 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}
}, },
// Hebrew // Hebrew
@@ -330,7 +330,7 @@ static wxFontEncoding
/* unix */ {wxFONTENCODING_ISO8859_8, STOP}, /* unix */ {wxFONTENCODING_ISO8859_8, STOP},
/* windows */ {wxFONTENCODING_CP1255, STOP}, /* windows */ {wxFONTENCODING_CP1255, STOP},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}
}, },
// Greek // Greek
@@ -338,7 +338,7 @@ static wxFontEncoding
/* unix */ {wxFONTENCODING_ISO8859_7, STOP}, /* unix */ {wxFONTENCODING_ISO8859_7, STOP},
/* windows */ {wxFONTENCODING_CP1253, STOP}, /* windows */ {wxFONTENCODING_CP1253, STOP},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}
}, },
// Arabic // Arabic
@@ -346,7 +346,7 @@ static wxFontEncoding
/* unix */ {wxFONTENCODING_ISO8859_6, STOP}, /* unix */ {wxFONTENCODING_ISO8859_6, STOP},
/* windows */ {wxFONTENCODING_CP1256, STOP}, /* windows */ {wxFONTENCODING_CP1256, STOP},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}
}, },
// Turkish // Turkish
@@ -354,7 +354,7 @@ static wxFontEncoding
/* unix */ {wxFONTENCODING_ISO8859_9, STOP}, /* unix */ {wxFONTENCODING_ISO8859_9, STOP},
/* windows */ {wxFONTENCODING_CP1254, STOP}, /* windows */ {wxFONTENCODING_CP1254, STOP},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}
}, },
// Cyrillic // Cyrillic
@@ -362,7 +362,7 @@ static wxFontEncoding
/* unix */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP}, /* unix */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP},
/* windows */ {wxFONTENCODING_CP1251, STOP}, /* windows */ {wxFONTENCODING_CP1251, STOP},
/* os2 */ {STOP}, /* os2 */ {STOP},
/* mac */ {STOP} /* mac */ {STOP}
}, },
{{STOP},{STOP},{STOP},{STOP}} /* Terminator */ {{STOP},{STOP},{STOP},{STOP}} /* Terminator */
@@ -386,7 +386,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
platform = wxPLATFORM_MAC; platform = wxPLATFORM_MAC;
#endif #endif
} }
int i, clas, e ; int i, clas, e ;
wxFontEncoding *f; wxFontEncoding *f;
wxFontEncodingArray arr; wxFontEncodingArray arr;
@@ -402,11 +402,11 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
if (*f == enc) arr.Add(enc); if (*f == enc) arr.Add(enc);
for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++) for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f); if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
i = NUM_OF_PLATFORMS/*hack*/; break; i = NUM_OF_PLATFORMS/*hack*/; break;
} }
clas++; clas++;
} }
return arr; return arr;
} }
@@ -417,7 +417,7 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
int i, clas, e, j ; int i, clas, e, j ;
wxFontEncoding *f; wxFontEncoding *f;
wxFontEncodingArray arr; wxFontEncodingArray arr;
arr = GetPlatformEquivalents(enc); // we want them to be first items in array arr = GetPlatformEquivalents(enc); // we want them to be first items in array
clas = 0; clas = 0;
@@ -428,12 +428,12 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
if (EquivalentEncodings[clas][i][e] == enc) if (EquivalentEncodings[clas][i][e] == enc)
{ {
for (j = 0; j < NUM_OF_PLATFORMS; j++) for (j = 0; j < NUM_OF_PLATFORMS; j++)
for (f = EquivalentEncodings[clas][j]; *f != STOP; f++) for (f = EquivalentEncodings[clas][j]; *f != STOP; f++)
if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f); if (arr.Index(*f) == wxNOT_FOUND) arr.Add(*f);
i = NUM_OF_PLATFORMS/*hack*/; break; i = NUM_OF_PLATFORMS/*hack*/; break;
} }
clas++; clas++;
} }
return arr; return arr;
} }

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)" ),