Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed writing to wxUniCharRef after its 'parent' iterator was destroyed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-08-26 13:02:38 +00:00
parent 3d593f49a4
commit 6bd4f2812d
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/unichar.h
View File

@@ -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;
};