Reactivtaed the new wxRect code

[wxWidgets.git] / src / common / tokenzr.cpp

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index 9fb4a543809c7f8af44a20531aa4f82b017a809c..19ae5e0f29a44ab49cfe32d98f3adb5deef8048b 100644 (file)
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -82,6 +82,16 @@ bool wxStringTokenizer::HasMoreToken()
   return (m_string.Length() != 0);
 }
 
+// AVS - added to fix leading whitespace / mult. delims bugs
+void wxStringTokenizer::EatLeadingDelims() 
+{
+  int pos;
+
+  while ((pos=FindDelims(m_string, m_delims))==0) { // while leading delims
+     m_string = m_string.Mid((size_t)1);     // trim 'em from the left
+  }
+}
+
 wxString wxStringTokenizer::NextToken()
 {
   register off_t pos, pos2;
@@ -90,10 +100,14 @@ wxString wxStringTokenizer::NextToken()
   if (m_string.IsNull())
     return m_string;
 
+  if (!m_retdelims)
+    EatLeadingDelims(); // AVS - added to fix leading whitespace /
+                        // mult. delims bugs
+
   pos = FindDelims(m_string, m_delims);
   if (pos == -1) {
     r_string = m_string;
-    m_string = (char *)NULL;
+    m_string = wxEmptyString;
     
     return r_string;
   }