X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c54322338f89f05ce7b2436edb94579f59897b14..fb29dcac01af849053d8f85b69aae7e7ca8c7d26:/src/common/datetime.cpp diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 71c1c95a8f..d796e6e127 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -13,7 +13,7 @@ // so long as the above copyright and this permission statement // are retained in all copies. // -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// /* @@ -97,6 +97,10 @@ #undef HAVE_STRPTIME #endif // broken strptime() +#if defined(__MWERKS__) && wxUSE_UNICODE + #include +#endif + #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM) #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) #define WX_TIMEZONE _timezone @@ -3237,7 +3241,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() ) {