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() ) {