From 153958f72d6c935a027b4a53768ed2dd9cd40674 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 8 Nov 2005 01:10:02 +0000 Subject: [PATCH] wxString(const unsigned char *) ctor doesn't crash by default with wxUSE_STL==1 any more git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/string.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/wx/string.h b/include/wx/string.h index 4cd3a70575..370fdc45bf 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -671,7 +671,10 @@ public: wxString(const wxWCharBuffer& psz) : wxStringBase(psz.data()) { } #else // ANSI // from C string (for compilers using unsigned char) - wxString(const unsigned char* psz, size_t nLength = npos) + wxString(const unsigned char* psz) + : wxStringBase((const char*)psz) { } + // from part of C string (for compilers using unsigned char) + wxString(const unsigned char* psz, size_t nLength) : wxStringBase((const char*)psz, nLength) { } #if wxUSE_WCHAR_T