From 3371873669823e49ac8b01e67711e453252eaa23 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 7 Jan 2008 01:35:28 +0000 Subject: [PATCH] added another ParseFormat() overload for better backwards compatibility git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/datetime.h | 11 +++++++++-- src/common/datetime.cpp | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 1c337df30a..b990cfb508 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1108,11 +1108,18 @@ public: return date + (end - datestr.begin()); } + const wchar_t *ParseFormat(const wchar_t *date, + const wchar_t *format = wxDefaultDateTimeFormat, + const wxDateTime& dateDef = wxDefaultDateTime) + { + return ParseFormat(date, wxString(format), dateDef); + } + const char *ParseFormat(const char *date, - const wxString& format = wxDefaultDateTimeFormat, + const char *format = wxDefaultDateTimeFormat, const wxDateTime& dateDef = wxDefaultDateTime) { - return ParseFormat(wxString(date), format, dateDef); + return ParseFormat(wxString(date), wxString(format), dateDef); } // parse a string containing the date/time in "free" format, this diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 5614ae84c0..948b3e6f26 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -3395,7 +3395,7 @@ wxDateTime::ParseFormat(const wxString& date, case _T('r'): // time as %I:%M:%S %p { wxDateTime dt; - input = dt.ParseFormat(input, _T("%I:%M:%S %p")); + input = dt.ParseFormat(input, wxS("%I:%M:%S %p")); if ( !input ) { // no match @@ -3414,7 +3414,7 @@ wxDateTime::ParseFormat(const wxString& date, case _T('R'): // time as %H:%M { wxDateTime dt; - input = dt.ParseFormat(input, _T("%H:%M")); + input = dt.ParseFormat(input, wxS("%H:%M")); if ( !input ) { // no match -- 2.45.2