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
This commit is contained in:
Vadim Zeitlin
2007-03-19 13:19:56 +00:00
parent 414b7b4016
commit c8eb817283

View File

@@ -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
// ----------------------------------------------------------------------------