applied utf-8 fix patch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 22:44:00 +00:00
parent f3d6a60294
commit 5707316c9c
3 changed files with 6 additions and 7 deletions
--- 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;
    }