From: Ove Kaaven Date: Fri, 16 Apr 1999 12:24:26 +0000 (+0000) Subject: operator+(const wxString&, const wx[W]CharBuffer) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/028a2b5d539dfccfadb4a4ffd829f1214b7d884a operator+(const wxString&, const wx[W]CharBuffer) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/string.h b/include/wx/string.h index 0413c5be5b..903bfcb311 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -1002,6 +1002,13 @@ wxString WXDLLEXPORT operator+(const wxString& string, wxChar ch); wxString WXDLLEXPORT operator+(wxChar ch, const wxString& string); wxString WXDLLEXPORT operator+(const wxString& string, const wxChar *psz); wxString WXDLLEXPORT operator+(const wxChar *psz, const wxString& string); +#if wxUSE_UNICODE +wxString WXDLLEXPORT operator+(const wxString& string, const wxWCharBuffer buf) +{ return string + (const wchar_t *)buf; } +#else +wxString WXDLLEXPORT operator+(const wxString& string, const wxCharBuffer buf) +{ return string + (const char *)buf; } +#endif // --------------------------------------------------------------------------- // Implementation only from here until the end of file