diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:07 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:07 +0200 |
| commit | 88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170 (patch) | |
| tree | c6c5babb49b90293380106b81ae5c446959ac70f /wx+/string_conv.h | |
| parent | 5.3 (diff) | |
| download | FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.gz FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.bz2 FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.zip | |
5.4
Diffstat (limited to 'wx+/string_conv.h')
| -rw-r--r-- | wx+/string_conv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wx+/string_conv.h b/wx+/string_conv.h index b23f6947..ba6f8d48 100644 --- a/wx+/string_conv.h +++ b/wx+/string_conv.h @@ -7,15 +7,15 @@ #ifndef STRINGCONV_H_INCLUDED #define STRINGCONV_H_INCLUDED -#include <zen/utf8.h> +#include <zen/utf.h> #include <wx/string.h> #include <zen/zstring.h> namespace zen { //conversion between Zstring and wxString -inline wxString toWx(const Zstring& str) { return utf8CvrtTo<wxString>(str); } -inline Zstring toZ(const wxString& str) { return utf8CvrtTo<Zstring>(str); } +inline wxString toWx(const Zstring& str) { return utfCvrtTo<wxString>(str); } +inline Zstring toZ(const wxString& str) { return utfCvrtTo<Zstring>(str); } inline std::vector<Zstring> toZ(const std::vector<wxString>& strList) { |