From a5243c0dbe5fd9955a5f1b174b9a83f8fd380dac Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 6 Apr 2003 15:39:39 +0000
Subject: [PATCH] Accept '\r' as delimiter when parsing dates (bug #684617)
 Backported from head

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt        | 1 +
 src/common/datetime.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 5c32249fc8..b36de710f7 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -181,6 +181,7 @@ All:
 - fixed assert (and crash in debug) in wxFileConfigGroup::DeleteSubgroupByName
 - fix for deleting entries at root level in wxFileConfig
 - wxStopWatch::Start() didn't resume it contrary to the docs
+- accept '\r' as delimiter when parsing dates
 
 Unix (GUI):
 
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 4c91d36c8b..977be2df05 100644
--- 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;
-    static const wxChar *dateDelimiters = _T(".,/-\t\n ");
+    static const wxChar *dateDelimiters = _T(".,/-\t\r\n ");
     wxStringTokenizer tok(p, dateDelimiters);
     while ( tok.HasMoreTokens() )
     {