The dataview sample compiles now, but doesn't work yet...

[wxWidgets.git] / include / wx / string.h

diff --git a/include/wx/string.h b/include/wx/string.h
index 04483f3e12f0bac4b0b2559b3b2de27a287ed7df..ac8c35b8bfcf497c105188b4e6503bfc9dc4f757 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -3010,7 +3010,7 @@ inline wxCStrData::wxCStrData(const wxCStrData& data)
 inline wxCStrData::~wxCStrData()
 {
     if ( m_owned )
-        delete m_str;
+        delete wx_const_cast(wxString*, m_str); // cast to silence warnings
 }
 
 // simple cases for AsChar() and AsWChar(), the complicated ones are
@@ -3126,7 +3126,7 @@ void wxStringIteratorNode::DoSet(const wxString *str,
                                  wxStringImpl::const_iterator *citer,
                                  wxStringImpl::iterator *iter)
 {
-    m_next = m_prev = NULL;
+    m_prev = NULL;
     m_iter = iter;
     m_citer = citer;
     m_str = str;
@@ -3137,6 +3137,10 @@ void wxStringIteratorNode::DoSet(const wxString *str,
         if ( m_next )
             m_next->m_prev = this;
     }
+    else
+    {
+        m_next = NULL;
+    }
 }
 
 void wxStringIteratorNode::clear()