From 9cc790869ed3905c78c7eeeb0bb44f800b3f2af4 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:11:09 +0200 Subject: 3.15 --- shared/string_conv.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'shared/string_conv.h') diff --git a/shared/string_conv.h b/shared/string_conv.h index 85181d11..24cb521e 100644 --- a/shared/string_conv.h +++ b/shared/string_conv.h @@ -22,8 +22,8 @@ Zstring wxToZ(const wxChar* str); Zstring wxToZ(wxChar ch); - - +wxString zxToWx(const zxString& str); +zxString wxToZx(const wxString& str); @@ -105,6 +105,20 @@ Zstring wxToZ(wxChar ch) { return wxToZ(wxString(ch)); } + + +inline +wxString zxToWx(const zxString& str) +{ + return wxString(str.c_str(), str.length()); +} + + +inline +zxString wxToZx(const wxString& str) +{ + return zxString(str.c_str(), str.length()); +} } #endif // STRINGCONV_H_INCLUDED -- cgit