fixed fatal bug in wxString ctor from wxCharBuffer when wxUSE_STL==1

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 16716878af510413cc77564b9f935a8ab7968e90..127b778e20469c05188a7dd4ff89ded09f7ccc52 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -116,6 +116,7 @@ All:
 - number of fixes to wxPluginManager (Rick Brice, Hans Van Leemputten)
 - fixed memory leak in wxURL when using a proxy (Steven Van Ingelgem)
 - fixed bug in wxDateTime::Set(jdn) when DST was in effect
+- fixed fatal bug in wxString when wxUSE_STL==1 (Kurt Granroth)
 - support msgids in charsets other than C and languages other than English
   (based on patch by Stefan Kowski)
 - added wxMicroSleep() and wxMilliSleep() replacing deprecated wxUsleep()

diff --git a/include/wx/string.h b/include/wx/string.h
index 1cf0b61485ac84fd5b926dc2aea77f10ddd65dad..2daf622c901a167e94efe8d71a6825ed0bd670bb 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -690,7 +690,7 @@ public:
 
     // from wxCharBuffer
   wxString(const wxCharBuffer& psz)
-      : wxStringBase(psz, npos) { }
+      : wxStringBase(psz) { }
 #endif // Unicode/ANSI
 
   // generic attributes & operations