use wxLocale::GetSystemEncoding() to test whetehr we want to use UTF-8 in wxConvBroke...
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 27 Mar 2005 22:43:56 +0000 (22:43 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 27 Mar 2005 22:43:56 +0000 (22:43 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/strconv.cpp

index db0147d6bc7706eaff14e6e4a6c3a1bb92ef2f95..e3ef168ba3ee0f6d1df0e72892c6b73a5234c1d2 100644 (file)
@@ -380,12 +380,7 @@ private:
 
 bool wxConvBrokenFileNames::UseUTF8() const
 {
-#if defined HAVE_LANGINFO_H && defined CODESET
-    char *codeset = nl_langinfo(CODESET);
-    return strcmp(codeset, "UTF-8") == 0;
-#else
-    return false;
-#endif
+    return wxLocale::GetSystemEncoding() == wxFONTENCODING_UTF8;
 }
 
 size_t wxConvBrokenFileNames::MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const