From fcd47970b8bef855b447a93fae1d05dcd5a79f11 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 7 Jan 2008 01:36:24 +0000 Subject: [PATCH] correct wrong last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/datetime.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/datetime.h b/include/wx/datetime.h index b990cfb508..5aac2b16d4 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1108,11 +1108,11 @@ public: return date + (end - datestr.begin()); } - const wchar_t *ParseFormat(const wchar_t *date, - const wchar_t *format = wxDefaultDateTimeFormat, - const wxDateTime& dateDef = wxDefaultDateTime) + const char *ParseFormat(const char *date, + const wxString& format = L"%c", + const wxDateTime& dateDef = wxDefaultDateTime) { - return ParseFormat(date, wxString(format), dateDef); + return ParseFormat(wxString(date), format, dateDef); } const char *ParseFormat(const char *date,