diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h
index 45d6dcb033..bd7eb59a66 100644
--- a/include/wx/propgrid/propgriddefs.h
+++ b/include/wx/propgrid/propgriddefs.h
@@ -669,7 +669,7 @@ public:
     wxString GetNextToken();
 
 protected:
-    const wxString*             m_str;
+    const wxString&             m_str;
     wxString::const_iterator    m_curPos;
     wxString                    m_readyToken;
     wxUniChar                   m_delimiter;
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index a1aa3e1b6a..c17c0814db 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -6168,7 +6168,7 @@ void wxPropertyGrid::RegisterDefaultEditors()
 // -----------------------------------------------------------------------
 
 wxPGStringTokenizer::wxPGStringTokenizer( const wxString& str, wxChar delimiter )
-    : m_str(&str), m_curPos(str.begin()), m_delimiter(delimiter)
+    : m_str(str), m_curPos(str.begin()), m_delimiter(delimiter)
 {
 }
 
@@ -6178,7 +6178,7 @@ wxPGStringTokenizer::~wxPGStringTokenizer()
 
 bool wxPGStringTokenizer::HasMoreTokens()
 {
-    const wxString& str = *m_str;
+    const wxString& str = m_str;
 
     wxString::const_iterator i = m_curPos;