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 0413c5be5b46346809535264c8286376dbc5b91b..903bfcb311101f4c583f18644e818570f8753be9 100644 (file)
--- 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);
 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
 
 // ---------------------------------------------------------------------------
 // Implementation only from here until the end of file