More wxChar conversion

[wxWidgets.git] / include / wx / string.h

diff --git a/include/wx/string.h b/include/wx/string.h
index 0413c5be5b46346809535264c8286376dbc5b91b..36f6a3773e4eef19679d8abbf95b2854ddecd026 100644 (file)
--- 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;
   wxChar *m_name;
   wxCharacterSet *m_cset;
   bool m_deferred;

+  void SetName(const wxChar *charset);

  public:
   wxCSConv(const wxChar *charset);
   virtual ~wxCSConv();
  public:
   wxCSConv(const wxChar *charset);
   virtual ~wxCSConv();


@@ -1002,6 +1003,17 @@ 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
+inline wxString WXDLLEXPORT operator+(const wxString& string, const wxWCharBuffer& buf)
+{ return string + (const wchar_t *)buf; }
+inline wxString WXDLLEXPORT operator+(const wxWCharBuffer& buf, const wxString& string)
+{ return (const wchar_t *)buf + string; }
+#else
+inline wxString WXDLLEXPORT operator+(const wxString& string, const wxCharBuffer& buf)
+{ return string + (const char *)buf; }
+inline wxString WXDLLEXPORT operator+(const wxCharBuffer& buf, const wxString& string)
+{ return (const char *)buf + string; }
+#endif

 
 // ---------------------------------------------------------------------------
 // Implementation only from here until the end of file
 
 // ---------------------------------------------------------------------------
 // Implementation only from here until the end of file