X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf88baa63e13ac5c972f6e095f1668a626155270..e97f6ab64ef2e1e3839114d95ad6b60b7ac5bd27:/include/wx/string.h

diff --git a/include/wx/string.h b/include/wx/string.h
index 201c91935d..36f6a3773e 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -223,6 +223,7 @@ class WXDLLEXPORT wxCSConv : public wxMBConv
   wxChar *m_name;
   wxCharacterSet *m_cset;
   bool m_deferred;
+  void SetName(const wxChar *charset);
  public:
   wxCSConv(const wxChar *charset);
   virtual ~wxCSConv();
@@ -1003,14 +1004,14 @@ 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)
+inline wxString WXDLLEXPORT operator+(const wxString& string, const wxWCharBuffer& buf)
 { return string + (const wchar_t *)buf; }
-wxString WXDLLEXPORT operator+(const wxWCharBuffer buf, const wxString& string)
+inline wxString WXDLLEXPORT operator+(const wxWCharBuffer& buf, const wxString& string)
 { return (const wchar_t *)buf + string; }
 #else
-wxString WXDLLEXPORT operator+(const wxString& string, const wxCharBuffer buf)
+inline wxString WXDLLEXPORT operator+(const wxString& string, const wxCharBuffer& buf)
 { return string + (const char *)buf; }
-wxString WXDLLEXPORT operator+(const wxCharBuffer buf, const wxString& string)
+inline wxString WXDLLEXPORT operator+(const wxCharBuffer& buf, const wxString& string)
 { return (const char *)buf + string; }
 #endif