X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/162e998c2f15f8773cbb63f0cceee8cdea4c421f..278f584fedf0647bf5dbb1c33ed2df11e2a59ad8:/include/wx/unichar.h diff --git a/include/wx/unichar.h b/include/wx/unichar.h index defc237114..8503c41992 100644 --- a/include/wx/unichar.h +++ b/include/wx/unichar.h @@ -16,7 +16,7 @@ #include "wx/stringimpl.h" class WXDLLIMPEXP_FWD_BASE wxUniCharRef; -class WXDLLIMPEXP_FWD_BASE wxStringIteratorNode; +class WXDLLIMPEXP_FWD_BASE wxString; // This class represents single Unicode character. It can be converted to // and from char or wchar_t and implements commonly used character operations. @@ -183,7 +183,7 @@ private: // create the reference #if wxUSE_UNICODE_UTF8 - wxUniCharRef(wxStringIteratorNode& node, iterator pos) : m_node(node), m_pos(pos) {} + wxUniCharRef(wxString& str, iterator pos) : m_str(str), m_pos(pos) {} #else wxUniCharRef(iterator pos) : m_pos(pos) {} #endif @@ -195,8 +195,8 @@ public: // that must be used explicitly (this is more than using 'explicit' // keyword on ctor!): #if wxUSE_UNICODE_UTF8 - static wxUniCharRef CreateForString(wxStringIteratorNode& node, iterator pos) - { return wxUniCharRef(node, pos); } + static wxUniCharRef CreateForString(wxString& str, iterator pos) + { return wxUniCharRef(str, pos); } #else static wxUniCharRef CreateForString(iterator pos) { return wxUniCharRef(pos); } @@ -287,7 +287,7 @@ private: private: // reference to the string and pointer to the character in string #if wxUSE_UNICODE_UTF8 - wxStringIteratorNode& m_node; + wxString& m_str; #endif iterator m_pos; };