More WinCE mods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,6 +37,11 @@ typedef wchar_t tchar;
|
||||
typedef char tchar;
|
||||
#endif
|
||||
|
||||
#ifdef __WXWINCE__
|
||||
#undef LINKAGEMODE
|
||||
#define LINKAGEMODE __cdecl
|
||||
#endif
|
||||
|
||||
static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
|
||||
{
|
||||
for (int i = 0; encodings_list[i].table != NULL; i++)
|
||||
@@ -52,8 +57,6 @@ typedef struct {
|
||||
wxUint8 c;
|
||||
} CharsetItem;
|
||||
|
||||
|
||||
|
||||
extern "C" int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
|
||||
{
|
||||
return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
|
||||
@@ -137,6 +140,8 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
|
||||
for (i = 0; i < 128; i++) m_Table[128 + i] = (tchar)in_tbl[i];
|
||||
return TRUE;
|
||||
}
|
||||
// FIXME: write a substitute for bsearch
|
||||
#ifndef __WXWINCE__
|
||||
else
|
||||
{
|
||||
CharsetItem *rev = BuildReverseTable(out_tbl);
|
||||
@@ -163,6 +168,8 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
|
||||
delete[] rev;
|
||||
return TRUE;
|
||||
}
|
||||
#endif
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user