Replaced ostream with FILE* in wxExpr.

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 1009dc8ec4acf2f53a29ea2fbb493111dd6d5fd2..1b42fd789319d28250c99a425201e8ce677a2b17 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -56,6 +56,11 @@
   IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
 #endif  //WXSTRING_IS_WXOBJECT
 
   IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
 #endif  //WXSTRING_IS_WXOBJECT
 

+#if wxUSE_UNICODE
+#undef wxUSE_EXPERIMENTAL_PRINTF
+#define wxUSE_EXPERIMENTAL_PRINTF 1
+#endif
+

 // allocating extra space for each string consumes more memory but speeds up
 // the concatenation operations (nLen is the current string's length)
 // NB: EXTRA_ALLOC must be >= 0!
 // allocating extra space for each string consumes more memory but speeds up
 // the concatenation operations (nLen is the current string's length)
 // NB: EXTRA_ALLOC must be >= 0!


@@ -89,6 +94,13 @@ extern const wxChar WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 // conditional compilation
 // ----------------------------------------------------------------------------
 

+#if !defined(__WXSW__) && wxUSE_UNICODE
+  #ifdef wxUSE_EXPERIMENTAL_PRINTF
+    #undef wxUSE_EXPERIMENTAL_PRINTF
+  #endif
+  #define wxUSE_EXPERIMENTAL_PRINTF 1
+#endif
+

 // we want to find out if the current platform supports vsnprintf()-like
 // function: for Unix this is done with configure, for Windows we test the
 // compiler explicitly.
 // we want to find out if the current platform supports vsnprintf()-like
 // function: for Unix this is done with configure, for Windows we test the
 // compiler explicitly.


@@ -253,18 +265,17 @@ wxString::wxString(const void *pStart, const void *pEnd)
 #if wxUSE_UNICODE
 
 // from multibyte string
 #if wxUSE_UNICODE
 
 // from multibyte string

-wxString::wxString(const char *psz, wxMBConvv& conv, size_t nLength)
+wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)

 {
   // first get necessary size
 {
   // first get necessary size

-
-  size_t nLen = conv.MB2WC((wchar_t *) NULL, psz, 0);
+  size_t nLen = psz ? conv.MB2WC((wchar_t *) NULL, psz, 0) : 0;

 
   // nLength is number of *Unicode* characters here!
 
   // nLength is number of *Unicode* characters here!

-  if (nLen > nLength)
+  if ((nLen != (size_t)-1) && (nLen > nLength))

     nLen = nLength;
 
   // empty?
     nLen = nLength;
 
   // empty?

-  if ( nLen != 0 ) {
+  if ( (nLen != 0) && (nLen != (size_t)-1) ) {

     AllocBuffer(nLen);
     conv.MB2WC(m_pchData, psz, nLen);
   }
     AllocBuffer(nLen);
     conv.MB2WC(m_pchData, psz, nLen);
   }


@@ -275,15 +286,15 @@ wxString::wxString(const char *psz, wxMBConvv& conv, size_t nLength)
 
 #else
 
 
 #else
 

+#if wxUSE_WCHAR_T

 // from wide string
 wxString::wxString(const wchar_t *pwz)
 {
   // first get necessary size
 // from wide string
 wxString::wxString(const wchar_t *pwz)
 {
   // first get necessary size

-
-  size_t nLen = wxWC2MB((char *) NULL, pwz, 0);
+  size_t nLen = pwz ? wxWC2MB((char *) NULL, pwz, 0) : 0;

 
   // empty?
 
   // empty?

-  if ( nLen != 0 ) {
+  if ( (nLen != 0) && (nLen != (size_t)-1) ) {

     AllocBuffer(nLen);
     wxWC2MB(m_pchData, pwz, nLen);
   }
     AllocBuffer(nLen);
     wxWC2MB(m_pchData, pwz, nLen);
   }


@@ -291,6 +302,7 @@ wxString::wxString(const wchar_t *pwz)
     Init();
   }
 }
     Init();
   }
 }

+#endif

 
 #endif
 
 
 #endif
 


@@ -497,12 +509,14 @@ wxString& wxString::operator=(const unsigned char* psz)
   return *this;
 }
 
   return *this;
 }
 

+#if wxUSE_WCHAR_T

 wxString& wxString::operator=(const wchar_t *pwz)
 {
   wxString str(pwz);
   *this = str;
   return *this;
 }
 wxString& wxString::operator=(const wchar_t *pwz)
 {
   wxString str(pwz);
   *this = str;
   return *this;
 }

+#endif

 
 #endif
 
 
 #endif
 


@@ -983,14 +997,17 @@ int wxString::Printf(const wxChar *pszFormat, ...)
 int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 {
   // static buffer to avoid dynamic memory allocation each time
 int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 {
   // static buffer to avoid dynamic memory allocation each time

-  static char s_szScratch[1024];
+  char s_szScratch[1024]; // using static buffer causes internal compiler err
+#if 0

 #if wxUSE_THREADS
   // protect the static buffer
   static wxCriticalSection critsect;
   wxCriticalSectionLocker lock(critsect);
 #endif
 #if wxUSE_THREADS
   // protect the static buffer
   static wxCriticalSection critsect;
   wxCriticalSectionLocker lock(critsect);
 #endif

+#endif

 
 

-#if 1 // the new implementation
+#if wxUSE_EXPERIMENTAL_PRINTF
+// the new implementation

 
   Reinit();
   for (size_t n = 0; pszFormat[n]; n++)
 
   Reinit();
   for (size_t n = 0; pszFormat[n]; n++)


@@ -1166,7 +1183,7 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
            char *val = va_arg(argptr, char *);
 #if wxUSE_UNICODE
            // ASCII->Unicode constructor handles max_width right
            char *val = va_arg(argptr, char *);
 #if wxUSE_UNICODE
            // ASCII->Unicode constructor handles max_width right

-           wxString s(val, max_width);
+           wxString s(val, wxConvLibc, max_width);

 #else
            size_t len = wxSTRING_MAXLEN;
            if (val) {
 #else
            size_t len = wxSTRING_MAXLEN;
            if (val) {


@@ -1187,8 +1204,8 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
            if (s.Len() < min_width)
              s.Pad(min_width - s.Len(), _T(' '), adj_left);
            *this += s;
            if (s.Len() < min_width)
              s.Pad(min_width - s.Len(), _T(' '), adj_left);
            *this += s;

-           done = TRUE;

          }
          }

+         done = TRUE;

          break;
        case _T('n'):
          if (ilen == 0) {
          break;
        case _T('n'):
          if (ilen == 0) {


@@ -1408,7 +1425,7 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nStart <= Len() );
 
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nStart <= Len() );
 

-  // # could be quicker than that
+  // TODO could be made much quicker than that

   const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);
   while ( p >= c_str() + str.Len() ) {
     if ( wxStrncmp(p - str.Len(), str, str.Len()) == 0 )
   const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);
   while ( p >= c_str() + str.Len() ) {
     if ( wxStrncmp(p - str.Len(), str, str.Len()) == 0 )


@@ -1423,19 +1440,131 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
 {
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
 {

-  return rfind(wxString(sz, n == npos ? 0 : n), nStart);
+    return rfind(wxString(sz, n == npos ? 0 : n), nStart);

 }
 
 size_t wxString::rfind(wxChar ch, size_t nStart) const
 {
 }
 
 size_t wxString::rfind(wxChar ch, size_t nStart) const
 {

-  wxASSERT( nStart <= Len() );
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }

 
 

-  const wxChar *p = wxStrrchr(c_str() + nStart, ch);
+    const wxChar *p = wxStrrchr(c_str(), ch);

 
 

-  return p == NULL ? npos : p - c_str();
+    if ( p == NULL )
+        return npos;
+
+    size_t result = p - c_str();
+    return ( result > nStart ) ? npos : result;

 }
 #endif // VC++ 1.5
 
 }
 #endif // VC++ 1.5
 

+size_t wxString::find_first_of(const wxChar* sz, size_t nStart) const
+{
+    const wxChar *start = c_str() + nStart;
+    const wxChar *firstOf = wxStrpbrk(start, sz);
+    if ( firstOf )
+        return firstOf - start;
+    else
+        return npos;
+}
+
+size_t wxString::find_last_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }
+
+    for ( const wxChar *p = c_str() + length() - 1; p >= c_str(); p-- )
+    {
+        if ( wxStrchr(sz, *p) )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }
+
+    size_t nAccept = wxStrspn(c_str() + nStart, sz);
+    if ( nAccept >= length() - nStart )
+        return npos;
+    else
+        return nAccept;
+}
+
+size_t wxString::find_first_not_of(wxChar ch, size_t nStart) const
+{
+    wxASSERT( nStart <= Len() );
+
+    for ( const wxChar *p = c_str() + nStart; *p; p++ )
+    {
+        if ( *p != ch )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }
+
+    for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
+    {
+        if ( !wxStrchr(sz, *p) )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxString::find_last_not_of(wxChar ch, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }
+
+    for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
+    {
+        if ( *p != ch )
+            return p - c_str();
+    }
+
+    return npos;
+}
+

 wxString wxString::substr(size_t nStart, size_t nLen) const
 {
   // npos means 'take all'
 wxString wxString::substr(size_t nStart, size_t nLen) const
 {
   // npos means 'take all'


@@ -1627,6 +1756,21 @@ void wxArrayString::Alloc(size_t nSize)
   m_nCount = 0;
 }
 
   m_nCount = 0;
 }
 

+// minimizes the memory usage by freeing unused memory
+void wxArrayString::Shrink()
+{
+  // only do it if we have some memory to free
+  if( m_nCount < m_nSize ) {
+    // allocates exactly as much memory as we need
+    wxChar **pNew = new wxChar *[m_nCount];              
+
+    // copy data to new location
+    memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
+    delete [] m_pItems;
+    m_pItems = pNew;
+  }
+}
+

 // searches the array for an item (forward or backwards)
 int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
 {
 // searches the array for an item (forward or backwards)
 int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
 {


@@ -1667,7 +1811,7 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex)
 {
   wxASSERT( str.GetStringData()->IsValid() );
 
 {
   wxASSERT( str.GetStringData()->IsValid() );
 

-  wxCHECK_RET( nIndex <= m_nCount, ("bad index in wxArrayString::Insert") );
+  wxCHECK_RET( nIndex <= m_nCount, _("bad index in wxArrayString::Insert") );

 
   Grow();
 
 
   Grow();
 


@@ -1788,12 +1932,19 @@ void wxArrayString::DoSort()
 // MBConv
 // ============================================================================
 
 // MBConv
 // ============================================================================
 

-WXDLLEXPORT_DATA(wxMBConv) wxConv_libc;
+WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
+#if !wxUSE_WCHAR_T
+WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;
+#endif
+
+#if wxUSE_WCHAR_T

 
 // ----------------------------------------------------------------------------
 // standard libc conversion
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // standard libc conversion
 // ----------------------------------------------------------------------------
 

+WXDLLEXPORT_DATA(wxMBConv) wxConvLibc;
+

 size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
   return wxMB2WC(buf, psz, n);
 size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
   return wxMB2WC(buf, psz, n);


@@ -1805,26 +1956,83 @@ size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// UTF-7
+// standard file conversion

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class wxMBConv_UTF7
+WXDLLEXPORT_DATA(wxMBConvFile) wxConvFile;
+
+// just use the libc conversion for now
+size_t wxMBConvFile::MB2WC(wchar_t *buf, const char *psz, size_t n) const

 {
 {

-public:
-  virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
-  virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
-};
+  return wxMB2WC(buf, psz, n);
+}
+
+size_t wxMBConvFile::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+  return wxWC2MB(buf, psz, n);
+}
+
+// ----------------------------------------------------------------------------
+// standard gdk conversion
+// ----------------------------------------------------------------------------
+
+#ifdef __WXGTK12__
+WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk;
+
+#include <gdk/gdk.h>
+
+size_t wxMBConvGdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+  if (buf) {
+    return gdk_mbstowcs((GdkWChar *)buf, psz, n);
+  } else {
+    GdkWChar *nbuf = new GdkWChar[n=strlen(psz)];
+    size_t len = gdk_mbstowcs(nbuf, psz, n);
+    delete [] nbuf;
+    return len;
+  }
+}
+
+size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+  char *mbstr = gdk_wcstombs((GdkWChar *)psz);
+  size_t len = mbstr ? strlen(mbstr) : 0;
+  if (buf) {
+    if (len > n) len = n;
+    memcpy(buf, psz, len);
+    if (len < n) buf[len] = 0;
+  }
+  return len;
+}
+#endif // GTK > 1.0
+
+// ----------------------------------------------------------------------------
+// UTF-7
+// ----------------------------------------------------------------------------

 
 

-// WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7;
-WXDLLEXPORT_DATA(wxMBConv) wxConv_UTF7;
+WXDLLEXPORT_DATA(wxMBConvUTF7) wxConvUTF7;
+
+#if 0
+static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                        "abcdefghijklmnopqrstuvwxyz"
+                        "0123456789'(),-./:?";
+static char utf7_setO[]="!\"#$%&*;<=>@[]^_`{|}";
+static char utf7_setB[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                        "abcdefghijklmnopqrstuvwxyz"
+                        "0123456789+/";
+#endif

 
 // TODO: write actual implementations of UTF-7 here
 
 // TODO: write actual implementations of UTF-7 here

-size_t wxMBConv_UTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t wxMBConvUTF7::MB2WC(wchar_t * WXUNUSED(buf),
+                           const char * WXUNUSED(psz),
+                           size_t WXUNUSED(n)) const

 {
   return 0;
 }
 
 {
   return 0;
 }
 

-size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t wxMBConvUTF7::WC2MB(char * WXUNUSED(buf),
+                           const wchar_t * WXUNUSED(psz),
+                           size_t WXUNUSED(n)) const

 {
   return 0;
 }
 {
   return 0;
 }


@@ -1833,54 +2041,310 @@ size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 // UTF-8
 // ----------------------------------------------------------------------------
 
 // UTF-8
 // ----------------------------------------------------------------------------
 

-class wxMBConv_UTF8
+WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;
+
+static unsigned long utf8_max[]={0x7f,0x7ff,0xffff,0x1fffff,0x3ffffff,0x7fffffff,0xffffffff};
+
+size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+  size_t len = 0;
+
+  while (*psz && ((!buf) || (len<n))) {
+    unsigned char cc=*psz++, fc=cc;
+    unsigned cnt;
+    for (cnt=0; fc&0x80; cnt++) fc<<=1;
+    if (!cnt) {
+      // plain ASCII char
+      if (buf) *buf++=cc;
+      len++;
+    } else {
+      cnt--;
+      if (!cnt) {
+       // invalid UTF-8 sequence
+       return (size_t)-1;
+      } else {
+       unsigned ocnt=cnt-1;
+       unsigned long res=cc&(0x3f>>cnt);
+       while (cnt--) {
+         cc = *psz++;
+         if ((cc&0xC0)!=0x80) {
+           // invalid UTF-8 sequence
+           return (size_t)-1;
+         }
+         res=(res<<6)|(cc&0x3f);
+       }
+       if (res<=utf8_max[ocnt]) {
+         // illegal UTF-8 encoding
+         return (size_t)-1;
+       }
+       if (buf) *buf++=res;
+       len++;
+      }
+    }
+  }
+  if (buf && (len<n)) *buf = 0;
+  return len;
+}
+
+size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+  size_t len = 0;
+
+  while (*psz && ((!buf) || (len<n))) {
+    unsigned long cc=(*psz++)&0x7fffffff;
+    unsigned cnt;
+    for (cnt=0; cc>utf8_max[cnt]; cnt++);
+    if (!cnt) {
+      // plain ASCII char
+      if (buf) *buf++=cc;
+      len++;
+    } else {
+      len+=cnt+1;
+      if (buf) {
+       *buf++=(-128>>cnt)|((cc>>(cnt*6))&(0x3f>>cnt));
+       while (cnt--)
+         *buf++=0x80|((cc>>(cnt*6))&0x3f);
+      }
+    }
+  }
+  if (buf && (len<n)) *buf = 0;
+  return len;
+}
+
+// ----------------------------------------------------------------------------
+// specified character set
+// ----------------------------------------------------------------------------
+
+class wxCharacterSet

 {
 public:
 {
 public:

-  virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
-  virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
+  wxArrayString names;
+  wchar_t *data;

 };
 
 };
 

-// WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8;
-WXDLLEXPORT_DATA(wxMBConv) wxConv_UTF8;
+#ifndef WX_PRECOMP
+  #include "wx/dynarray.h"
+  #include "wx/filefn.h"
+  #include "wx/textfile.h"
+  #include "wx/tokenzr.h"
+  #include "wx/utils.h"
+#endif

 
 

-// TODO: write actual implementations of UTF-8 here
-size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-  return wxMB2WC(buf, psz, n);
+WX_DECLARE_OBJARRAY(wxCharacterSet, wxCSArray);
+#include "wx/arrimpl.cpp"
+WX_DEFINE_OBJARRAY(wxCSArray);
+
+static wxCSArray wxCharsets;
+
+static void wxLoadCharacterSets(void)
+{
+  static bool already_loaded = FALSE;
+
+  if (already_loaded) return;
+
+  already_loaded = TRUE;
+#if defined(__UNIX__) && wxUSE_TEXTFILE
+  // search through files in /usr/share/i18n/charmaps
+  wxString fname;
+  for (fname = ::wxFindFirstFile(_T("/usr/share/i18n/charmaps/*"));
+       !fname.IsEmpty();
+       fname = ::wxFindNextFile()) {
+    wxTextFile cmap(fname);
+    if (cmap.Open()) {
+      wxCharacterSet *cset = new wxCharacterSet;
+      wxString comchar,escchar;
+      bool in_charset = FALSE;
+
+      // wxFprintf(stderr,_T("Loaded: %s\n"),fname.c_str());
+
+      wxString line;
+      for (line = cmap.GetFirstLine();
+          !cmap.Eof();
+          line = cmap.GetNextLine()) {
+       // wxFprintf(stderr,_T("line contents: %s\n"),line.c_str());
+       wxStringTokenizer token(line);
+       wxString cmd = token.GetNextToken();
+       if (cmd == comchar) {
+         if (token.GetNextToken() == _T("alias"))
+           cset->names.Add(token.GetNextToken());
+       }
+       else if (cmd == _T("<code_set_name>"))
+         cset->names.Add(token.GetNextToken());
+       else if (cmd == _T("<comment_char>"))
+         comchar = token.GetNextToken();
+       else if (cmd == _T("<escape_char>"))
+         escchar = token.GetNextToken();
+       else if (cmd == _T("<mb_cur_min>")) {
+         delete cset;
+         cset = (wxCharacterSet *) NULL;
+         break; // we don't support multibyte charsets ourselves (yet)
+       }
+       else if (cmd == _T("CHARMAP")) {
+         cset->data = (wchar_t *)calloc(256, sizeof(wchar_t));
+         in_charset = TRUE;
+       }
+       else if (cmd == _T("END")) {
+         if (token.GetNextToken() == _T("CHARMAP"))
+           in_charset = FALSE;
+       }
+       else if (in_charset) {
+         // format: <NUL> /x00 <U0000> NULL (NUL)
+         //         <A>   /x41 <U0041> LATIN CAPITAL LETTER A
+         wxString hex = token.GetNextToken();
+         // skip whitespace (why doesn't wxStringTokenizer do this?)
+         while (wxIsEmpty(hex) && token.HasMoreTokens()) hex = token.GetNextToken();
+         wxString uni = token.GetNextToken();
+         // skip whitespace again
+         while (wxIsEmpty(uni) && token.HasMoreTokens()) uni = token.GetNextToken();
+         if ((hex.Len() > 2) && (wxString(hex.GetChar(0)) == escchar) && (hex.GetChar(1) == _T('x')) &&
+             (uni.Left(2) == _T("<U"))) {
+           hex.MakeUpper(); uni.MakeUpper();
+           int pos = ::wxHexToDec(hex.Mid(2,2));
+           if (pos>=0) {
+             unsigned long uni1 = ::wxHexToDec(uni.Mid(2,2));
+             unsigned long uni2 = ::wxHexToDec(uni.Mid(4,2));
+             cset->data[pos] = (uni1 << 16) | uni2;
+             // wxFprintf(stderr,_T("char %02x mapped to %04x (%c)\n"),pos,cset->data[pos],cset->data[pos]);
+           }
+         }
+       }
+      }
+      if (cset) {
+       cset->names.Shrink();
+       wxCharsets.Add(cset);
+      }
+    }
+  }
+#endif
+  wxCharsets.Shrink();

 }
 
 }
 

-size_t wxMBConv_UTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+static wxCharacterSet *wxFindCharacterSet(const wxChar *charset)

 {
 {

-  return wxWC2MB(buf, psz, n);
+  if (!charset) return (wxCharacterSet *)NULL;
+  wxLoadCharacterSets();
+  for (size_t n=0; n<wxCharsets.GetCount(); n++)
+    if (wxCharsets[n].names.Index(charset) != wxNOT_FOUND)
+      return &(wxCharsets[n]);
+  return (wxCharacterSet *)NULL;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// specified character set
-// ----------------------------------------------------------------------------
+WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);

 
 

-// TODO: write actual implementation of character set conversion here

 wxCSConv::wxCSConv(const wxChar *charset)
 {
 wxCSConv::wxCSConv(const wxChar *charset)
 {

-  data = (wxChar *) NULL;
+  m_name = (wxChar *) NULL;
+  m_cset = (wxCharacterSet *) NULL;
+  m_deferred = TRUE;
+  SetName(charset);
+}
+
+wxCSConv::~wxCSConv()
+{
+  if (m_name) free(m_name);
+}
+
+void wxCSConv::SetName(const wxChar *charset)
+{
+  if (charset) {
+#ifdef __UNIX__
+    // first, convert the character set name to standard form
+    wxString codeset;
+    if (wxString(charset,3).CmpNoCase(_T("ISO")) == 0) {
+      // make sure it's represented in the standard form: ISO_8859-1
+      codeset = _T("ISO_");
+      charset += 3;
+      if ((*charset == _T('-')) || (*charset == _T('_'))) charset++;
+      if (wxStrlen(charset)>4) {
+       if (wxString(charset,4) == _T("8859")) {
+         codeset << _T("8859-");
+         if (*charset == _T('-')) charset++;
+       }
+      }
+    }
+    codeset << charset;
+    codeset.MakeUpper();
+    m_name = wxStrdup(codeset.c_str());
+    m_deferred = TRUE;
+#endif
+  }
+}
+
+void wxCSConv::LoadNow()
+{
+//  wxPrintf(_T("Conversion request\n"));
+  if (m_deferred) {
+    if (!m_name) {
+#ifdef __UNIX__
+      wxChar *lang = wxGetenv(_T("LANG"));
+      wxChar *dot = lang ? wxStrchr(lang, _T('.')) : (wxChar *)NULL;
+      if (dot) SetName(dot+1);
+#endif
+    }
+    m_cset = wxFindCharacterSet(m_name);
+    m_deferred = FALSE;
+  }

 }
 
 size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
 }
 
 size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {

-  if (buf && !data) {
-    // latin-1 (direct)
-    for (size_t c=0; c<=n; c++)
-      buf[c] = psz[c];
+  ((wxCSConv *)this)->LoadNow(); // discard constness
+  if (buf) {
+    if (m_cset) {
+      for (size_t c=0; c<n; c++)
+       buf[c] = m_cset->data[(unsigned char)(psz[c])];
+    } else {
+      // latin-1 (direct)
+      for (size_t c=0; c<n; c++)
+       buf[c] = (unsigned char)(psz[c]);
+    }
+    return n;

   }
   }

-  return n;
+  return strlen(psz);

 }
 
 size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {
 }
 
 size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 {

-  if (buf && !data) {
-    // latin-1 (direct)
-    for (size_t c=0; c<=n; c++)
-      buf[c] = (psz[c]>0xff) ? '?' : psz[c];
+  ((wxCSConv *)this)->LoadNow(); // discard constness
+  if (buf) {
+    if (m_cset) {
+      for (size_t c=0; c<n; c++) {
+       size_t n;
+       for (n=0; (n<256) && (m_cset->data[n] != psz[c]); n++);
+       buf[c] = (n>0xff) ? '?' : n;
+      }
+    } else {
+      // latin-1 (direct)
+      for (size_t c=0; c<n; c++)
+       buf[c] = (psz[c]>0xff) ? '?' : psz[c];
+    }
+    return n;

   }
   }

-  return n;
+  return wcslen(psz);

 }
 
 }
 

+#endif//wxUSE_WCHAR_T
+
+#if wxUSE_WCHAR_T
+const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
+    {
+      if (psz) {
+        size_t nLen = MB2WC((wchar_t *) NULL, psz, 0);
+        wxWCharBuffer buf(nLen);
+        MB2WC(WCSTRINGCAST buf, psz, nLen);
+        return buf;
+      } else return wxWCharBuffer((wchar_t *) NULL);
+    }
+
+const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const
+    {
+      if (psz) {
+        size_t nLen = WC2MB((char *) NULL, psz, 0);
+        wxCharBuffer buf(nLen);
+        WC2MB(MBSTRINGCAST buf, psz, nLen);
+        return buf;
+      } else return wxCharBuffer((char *) NULL);
+    }
+
+#endif//wxUSE_WCHAR_T
+