bsearch() is now available under CE, use it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 6fbf324fbf9ed216acb5441068b3e66b19043279..13850247c9a66a1ea60a82fd87a3561a75037d42 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -26,37 +26,34 @@
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
 #if defined( __BORLANDC__ ) || defined(__DARWIN__)
 
 // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
 #if defined( __BORLANDC__ ) || defined(__DARWIN__)

-#include "../common/unictabl.inc"
+    #include "../common/unictabl.inc"

 #else
 #else

-#include "unictabl.inc"
+    #include "unictabl.inc"

 #endif
 
 #if wxUSE_WCHAR_T
 #endif
 
 #if wxUSE_WCHAR_T

-typedef wchar_t tchar;
+    typedef wchar_t tchar;

 #else
 #else

-typedef char tchar;
-#endif
-
-#ifdef __WXWINCE__
-#undef LINKAGEMODE
-#define LINKAGEMODE __cdecl
+    typedef char tchar;

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

+    #include <ATSUnicode.h>
+    #include <TextCommon.h>
+    #include <TextEncodingConverter.h>

 
 

-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
+    #include "wx/fontutil.h"
+    #include "wx/mac/private.h"  // includes mac headers

 
 

-#include "wx/fontutil.h"
-#include "wx/mac/private.h"  // includes mac headers
-
-wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
-bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
+    wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
+    bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
+#endif

 
 

+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()

 #endif
 
 #endif
 

-static wxUint16* LINKAGEMODE GetEncTable(wxFontEncoding enc)
+static wxUint16* GetEncTable(wxFontEncoding enc)

 {
 #ifdef __WXMAC__
     if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
 {
 #ifdef __WXMAC__
     if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )


@@ -97,13 +94,14 @@ typedef struct {
     wxUint8  c;
 } CharsetItem;
 
     wxUint8  c;
 } 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];
             return TRUE;
         }
             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 // output !Unicode
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
         else // output !Unicode
         {
             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;