From a0bcd61bbcc2d081aec082cd6cf9cb29d1e86ae5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 3 Feb 2008 14:38:11 +0000 Subject: [PATCH] compilation fix for wchar_t-based builds after ParseISOXXX() additions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/datetime.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/datetime.h b/include/wx/datetime.h index c648073ed8..a18dad3cc5 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1128,21 +1128,21 @@ public: // provide compatibility overloads for them bool ParseISODate(const wxString& date) { - const wxStringCharType *p = ParseFormat(date, wxS("%Y-%m-%d")); - return p && !*p; + wxString::const_iterator end; + return ParseFormat(date, wxS("%Y-%m-%d"), &end) && end == date.end(); } - bool ParseISOTime(const wxString& date) + bool ParseISOTime(const wxString& time) { - const wxStringCharType *p = ParseFormat(date, wxS("%H:%M:%S")); - return p && !*p; + wxString::const_iterator end; + return ParseFormat(time, wxS("%H:%M:%S"), &end) && end == time.end(); } - bool ParseISOCombined(const wxString& date, char sep = 'T') + bool ParseISOCombined(const wxString& datetime, char sep = 'T') { + wxString::const_iterator end; const wxString fmt = wxS("%Y-%m-%d") + wxString(sep) + wxS("%H:%M:%S"); - const wxStringCharType *p = ParseFormat(date, fmt.wx_str()); - return p && !*p; + return ParseFormat(datetime, fmt, &end) && end == datetime.end(); } // parse a string containing the date/time in "free" format, this -- 2.45.2