From: Ove Kaaven <ovek@arcticnet.no>
Date: Thu, 15 Apr 1999 15:13:26 +0000 (+0000)
Subject: Another inline constructor to facilitate Unicode conversion without #if-ing...
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3a309a64d74bd04d9be4799f28c34b69d06a06d8

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 96a2184a64..6ba40254f7 100644
--- 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 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