fixed serious bug in wxFont::operator== (ignored weight)

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index d404a98cb8a36fb3c0351d6505b87d8cd9596efd..72a879991f094e23cbe6b99bbbe5ea555e7897b6 100644 (file)
--- 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) ||
     // 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;
     }
       // nope, don't use libc conversion
       return FALSE;
     }