Another inline constructor to facilitate Unicode conversion without #if-ing...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 96a2184a645f328a628f45b23af9d8681ca0a51d..6ba40254f702449957b8739c87f8af637dc52472 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -359,6 +359,9 @@ public:
     // from C string (for compilers using unsigned char)
   wxString(const unsigned char* psz, size_t nLength = wxSTRING_MAXLEN)
     { InitWith((const char*)psz, 0, nLength); }
     // from C string (for compilers using unsigned char)
   wxString(const unsigned char* psz, size_t nLength = wxSTRING_MAXLEN)
     { InitWith((const char*)psz, 0, nLength); }

+    // from multibyte string
+  wxString(const char *psz, wxMBConv& WXUNUSED(conv), size_t nLength = wxSTRING_MAXLEN)
+    { InitWith(psz, 0, nLength); }

     // from wide (Unicode) string
   wxString(const wchar_t *pwz);
     // from wxCharBuffer
     // from wide (Unicode) string
   wxString(const wchar_t *pwz);
     // from wxCharBuffer