accept \r as a delimiter when parsing dates (bug 684617)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 71c1c95a8f9986de0445934055ddfc766980b116..eb28a5c0b0c003bc0db3671c0a73ca283ce35d2c 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -3237,7 +3237,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
 
     // tokenize the string
     size_t nPosCur = 0;
 
     // tokenize the string
     size_t nPosCur = 0;

-    static const wxChar *dateDelimiters = _T(".,/-\t\n ");
+    static const wxChar *dateDelimiters = _T(".,/-\t\r\n ");

     wxStringTokenizer tok(p, dateDelimiters);
     while ( tok.HasMoreTokens() )
     {
     wxStringTokenizer tok(p, dateDelimiters);
     while ( tok.HasMoreTokens() )
     {