X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66b3ec7f9a6924fa952e67912b3d7d833e278742..6dbaf73491042ef98cde2df3a3cf0b14da827278:/src/common/wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index f9e73aed8a..72a879991f 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -105,7 +105,8 @@ bool WXDLLEXPORT wxOKlibc()
     // this is UTF-8 allright, check whether that's what we want
     char *cur_locale = setlocale(LC_CTYPE, NULL);
     if ((strlen(cur_locale) < 4) ||
-	(strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) {
+	(strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
+	(strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
       // nope, don't use libc conversion
       return FALSE;
     }
@@ -168,6 +169,19 @@ int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
 }
 #endif
 
+#ifndef wxStricmp
+int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n)
+{
+  register wxChar c1, c2;
+  while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++;
+  if (n) {
+    if (c1 < c2) return -1;
+    if (c1 > c2) return 1;
+  }
+  return 0;
+}
+#endif
+
 #ifndef wxStrtok
 WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {