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

bsearch() is now available under CE, use it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-04 13:01:50 +00:00
parent f153c2b611
commit 0f8d646134
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/encconv.cpp
View File

@@ -37,13 +37,7 @@ typedef wchar_t tchar;
typedef char tchar; typedef char tchar;
#endif #endif
#ifdef __WXWINCE__
#undef LINKAGEMODE
#define LINKAGEMODE __cdecl
#endif
#ifdef __WXMAC__ #ifdef __WXMAC__
#include <ATSUnicode.h> #include <ATSUnicode.h>
#include <TextCommon.h> #include <TextCommon.h>
#include <TextEncodingConverter.h> #include <TextEncodingConverter.h>
@@ -53,10 +47,13 @@ typedef char tchar;
wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ; wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ; bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
#endif #endif
static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc) #ifdef __WXWINCE__
#include "wx/msw/wince/missing.h" // for bsearch()
#endif
static wxUint16* GetEncTable(wxFontEncoding enc)
{ {
#ifdef __WXMAC__ #ifdef __WXMAC__
if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX ) if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
@@ -97,13 +94,14 @@ typedef struct {
wxUint8 c; wxUint8 c;
} CharsetItem; } CharsetItem;
extern "C" int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2) extern "C" int wxCMPFUNC_CONV
CompareCharsetItems(const void *i1, const void *i2)
{ {
return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u ); return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
} }
static CharsetItem* LINKAGEMODE BuildReverseTable(wxUint16 *tbl) static CharsetItem* BuildReverseTable(wxUint16 *tbl)
{ {
CharsetItem *rev = new CharsetItem[128]; CharsetItem *rev = new CharsetItem[128];
@@ -178,8 +176,6 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
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;
} }
// FIXME: write a substitute for bsearch
#ifndef __WXWINCE__
else // output !Unicode else // output !Unicode
{ {
CharsetItem *rev = BuildReverseTable(out_tbl); CharsetItem *rev = BuildReverseTable(out_tbl);
@@ -205,7 +201,6 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
delete[] rev; delete[] rev;
} }
#endif // !__WXWINCE__
} }
return TRUE; return TRUE;