char -> wxChar. (Vadim, you can probably just go ahead messing with

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 4b42a151b1d883a8ba186120bc4a66769de9da84..ac53c0dd08c16c88285684c0bd35335c2e40ccf8 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -209,8 +209,8 @@ class WXDLLEXPORT wxCSConv : wxMBConv
   wxChar *data;
  public:
   wxCSConv(const wxChar *charset);
-  virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n);
-  virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n);
+  virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
+  virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
 };
 
 // filenames are multibyte on Unix and probably widechar on Windows?
@@ -444,11 +444,16 @@ public:
   wxString& operator=(wxChar ch);
     // from a C string
   wxString& operator=(const wxChar *psz);
-#if !wxUSE_UNICODE
+#if wxUSE_UNICODE
+    // from wxWCharBuffer
+  wxString& operator=(const wxWCharBuffer& psz) { return operator=((const wchar_t *)psz); }
+#else
     // from another kind of C string
   wxString& operator=(const unsigned char* psz);
     // from a wide string
   wxString& operator=(const wchar_t *pwz);
+    // from wxCharBuffer
+  wxString& operator=(const wxCharBuffer& psz) { return operator=((const char *)psz); }
 #endif
 
   // string concatenation