added check for GTK 1.2

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 3f70fe66dc397e61c019474d0b3b106c7764a81e..f95e5d6c8fb6157f353844563790e6027c5d0b2f 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -39,9 +39,14 @@
   #include "wx/hash.h"
 #endif
 
-size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
+#if wxUSE_WCHAR_T
+size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   if (buf) {
+    if (!n || !*psz) {
+      if (n) *buf = _T('\0');
+      return 0;
+    }
     return mbstowcs(buf, psz, n);
   }
 
@@ -57,9 +62,14 @@ size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 #endif // GNU
 }
 
-size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
+size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 {
   if (buf) {
+    if (!n || !*pwz) {
+      // glibc2.1 chokes on null input
+      if (n) *buf = '\0';
+      return 0;
+    }
     return wcstombs(buf, pwz, n);
   }
 
@@ -74,6 +84,36 @@ size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
   return wcstombs((char *) NULL, pwz, 0);
 #endif // GNU
 }
+#endif
+
+bool WXDLLEXPORT wxOKlibc()
+{
+#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__)
+  // GNU libc uses UTF-8 even when it shouldn't
+  wchar_t res;
+  if ((MB_CUR_MAX == 2) &&
+      (wxMB2WC(&res, "\xdd\xa5", 1)>0) &&
+      (res==0x765)) {
+    // this is UTF-8 allright, check whether that's what we want
+    char *cur_locale = setlocale(LC_ALL, NULL);
+    if ((strlen(cur_locale) < 4) ||
+       (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) {
+      // nope, don't use libc conversion
+      return FALSE;
+    }
+  }
+#endif
+  return TRUE;
+}
+
+#ifdef wxNEED_WCSLEN
+size_t   WXDLLEXPORT wcslen(const wchar_t *s)
+{
+  size_t len;
+  while (s[len]) len++;
+  return len;
+}
+#endif
 
 #ifndef wxStrdup
 wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)
@@ -85,6 +125,18 @@ wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)
 }
 #endif
 
+#ifndef wxStricmp
+int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
+{
+  register wxChar c1, c2;
+  do {
+    c1 = wxTolower(*psz1++);
+    c2 = wxTolower(*psz2++);
+  } while ( c1 && (c1 == c2) );
+  return c1 - c2;
+}
+#endif
+
 #ifndef wxStrtok
 wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {
@@ -145,7 +197,7 @@ int WXDLLEXPORT wxFprintf(FILE *stream, const wxChar *fmt, ...)
   return ret;
 }
 
-int WXDLLEXPORT wxFvprintf(FILE *stream, const wxChar *fmt, va_list argptr)
+int WXDLLEXPORT wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr)
 {
   wxString str;
   str.PrintfV(fmt,argptr);