From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 19 Mar 2007 13:19:56 +0000 (+0000)
Subject: added wxString::operator=(const wxCStrData&) to make it possible to compile code... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c8eb81728366c36a7520663c868af4a1870f7c3a?ds=inline

added wxString::operator=(const wxCStrData&) to make it possible to compile code like "wxString s = s.c_str() + 1" again (also fixes wxGTK1 compilation)


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

diff --git a/include/wx/string.h b/include/wx/string.h
index 90d3b378f2..65edbb87e0 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -1144,6 +1144,7 @@ public:
     // from another wxString
   wxString& operator=(const wxStringBase& stringSrc)
     { return (wxString&)wxStringBase::operator=(stringSrc); }
+  wxString& operator=(const wxCStrData& cstr);
     // from a character
   wxString& operator=(wxUniChar ch)
     { return (wxString&)wxStringBase::operator=(ch); }
@@ -2013,6 +2014,15 @@ inline wxUniChar wxCStrData::operator[](size_t n) const
     return m_str->at(m_offset + n);
 }
 
+// ----------------------------------------------------------------------------
+// implementation of wxString inline methods using wxCStrData
+// ----------------------------------------------------------------------------
+
+inline wxString& wxString::operator=(const wxCStrData& cstr)
+{
+    return *this = cstr.AsString();
+}
+
 // ----------------------------------------------------------------------------
 // implementation of wx[W]CharBuffer inline methods using wxCStrData
 // ----------------------------------------------------------------------------