don't break lines in the middle of word

[wxWidgets.git] / src / common / encconv.cpp

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 759dd58fa5549b8ebd9e58c45f7dd90a89cb8c36..802aca454e7774f2ee5a03ef48f8c2092800b2fa 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -37,6 +37,11 @@ typedef wchar_t tchar;
 typedef char tchar;
 #endif
 
 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++)
 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;
 
     wxUint8  c;
 } CharsetItem;
 

-
-

 extern "C" int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
 extern "C" int LINKAGEMODE CompareCharsetItems(const void *i1, const void *i2)
 {
     return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );


@@ -118,10 +121,8 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
             m_Table[out_tbl[i]] = (tchar)(128 + i);
 
         m_UnicodeInput = TRUE;
             m_Table[out_tbl[i]] = (tchar)(128 + i);
 
         m_UnicodeInput = TRUE;

-        return TRUE;

     }
     }

-
-    else
+    else // input !Unicode

     {
         if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
         if (output_enc != wxFONTENCODING_UNICODE)
     {
         if ((in_tbl = GetEncTable(input_enc)) == NULL) return FALSE;
         if (output_enc != wxFONTENCODING_UNICODE)


@@ -137,7 +138,9 @@ 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;
         }

-        else
+        // FIXME: write a substitute for bsearch
+#ifndef __WXWINCE__
+        else // output !Unicode

         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
             CharsetItem *item;
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
             CharsetItem *item;


@@ -161,9 +164,11 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
             }
 
             delete[] rev;
             }
 
             delete[] rev;

-            return TRUE;

         }
         }

+#endif // !__WXWINCE__

     }
     }

+
+    return TRUE;

 }
 
 
 }