From 44d12026b8577bc687cb00802bbb9edf4d5204d3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Mar 2005 22:43:56 +0000 Subject: [PATCH] use wxLocale::GetSystemEncoding() to test whetehr we want to use UTF-8 in wxConvBrokenFileNames::UseUTF8() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/strconv.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index db0147d6bc..e3ef168ba3 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -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 -- 2.47.2