Use wxString::Clone() instead of c_str() in wxThreadEvent copy ctor.

Creating a new wxString from c_str() of the old one resulted in dropping all
string data after the first embedded NUL. Fix this by using Clone() method
that exists specifically for this purpose. It also makes the code more clear.

Closes #14380.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index e886f895b2b0b2941310f87261a01c328f01e204..951e0af08802c9df80304888b7b9cfa8c63c0afb 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -523,6 +523,7 @@ All:
 - Fix deadlock due to too many events in Unix console apps (Lukasz Michalski).
 - Added wxDir::GetNameWithSep().
 - Allow unloading wxPluginLibrary objects in any order (manyleaves).
+- Fix passing strings with embedded NULs in wxThreadEvents (sodev).
 
 All (GUI):
 

diff --git a/include/wx/event.h b/include/wx/event.h
index 8303647c39b9f2d52d2a93404b3f988c59bbf157..283a0f56cd4d6e6e9958a24beff68f158e9e34b9 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1244,7 +1244,7 @@ public:
     {
         // make sure our string member (which uses COW, aka refcounting) is not
         // shared by other wxString instances:
-        SetString(GetString().c_str());
+        SetString(GetString().Clone());
     }
 
     virtual wxEvent *Clone() const