diff --git a/include/wx/string.h b/include/wx/string.h index ba651e5d97..f08d162cad 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -380,8 +380,9 @@ protected: #if wxUSE_UNICODE_UTF8 // see the comment near wxString::iterator for why we need this -struct WXDLLIMPEXP_BASE wxStringIteratorNode +class WXDLLIMPEXP_BASE wxStringIteratorNode { +public: wxStringIteratorNode() : m_str(NULL), m_citer(NULL), m_iter(NULL), m_prev(NULL), m_next(NULL) {} wxStringIteratorNode(const wxString *str, @@ -1875,7 +1876,7 @@ public: wxString& append(const wxString& str, size_t pos, size_t n) { size_t from, len; - str.PosLenToImpl(pos, n, &from, &len); + PosLenToImpl(pos, n, &from, &len); m_impl.append(str.m_impl, from, len); return *this; } @@ -1942,7 +1943,7 @@ public: wxString& assign(const wxString& str, size_t pos, size_t n) { size_t from, len; - str.PosLenToImpl(pos, n, &from, &len); + PosLenToImpl(pos, n, &from, &len); m_impl.assign(str.m_impl, from, len); return *this; } @@ -2038,7 +2039,7 @@ public: wxString& insert(size_t nPos, const wxString& str, size_t nStart, size_t n) { size_t from, len; - str.PosLenToImpl(nStart, n, &from, &len); + PosLenToImpl(nStart, n, &from, &len); m_impl.insert(PosToImpl(nPos), str.m_impl, from, len); return *this; } @@ -2168,7 +2169,7 @@ public: PosLenToImpl(nStart, nLen, &from, &len); size_t from2, len2; - str.PosLenToImpl(nStart2, nLen2, &from2, &len2); + PosLenToImpl(nStart2, nLen2, &from2, &len2); m_impl.replace(from, len, str.m_impl, from2, len2); return *this;