diff --git a/libraries/lib-string-utils/CodeConversions.cpp b/libraries/lib-string-utils/CodeConversions.cpp index 54fc4d748..fc989b950 100644 --- a/libraries/lib-string-utils/CodeConversions.cpp +++ b/libraries/lib-string-utils/CodeConversions.cpp @@ -28,7 +28,14 @@ std::string ToUTF8 (const wchar_t* wstr) std::string ToUTF8 (const wxString& wstr) { +#if wxCHECK_VERSION(3, 1, 1) return wstr.ToStdString (wxGet_wxConvUTF8 ()); +#elif !wxUSE_UNICODE + return std::string (wstr.c_str (), wstr.length ()); +#else + wxScopedCharBuffer buf (wstr.mb_str (wxGet_wxConvUTF8 ())); + return std::string (buf.data (), buf.length ()); +#endif } std::wstring ToWString (const std::string& str) @@ -48,7 +55,11 @@ std::wstring ToWString (const wxString& str) wxString ToWXString (const std::string& str) { +#if wxCHECK_VERSION(3, 1, 1) return wxString::FromUTF8 (str); +#else + return wxString::FromUTF8 (str.c_str()); +#endif } wxString ToWXString (const std::wstring& str)