Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added another ParseFormat() overload for better backwards compatibility

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-01-07 01:35:28 +00:00
parent ac2b78257b
commit 3371873669
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/datetime.h
View File

@@ -1108,11 +1108,18 @@ public:
return date + (end - datestr.begin()); return date + (end - datestr.begin());
} }
const char *ParseFormat(const char *date, const wchar_t *ParseFormat(const wchar_t *date,
const wxString& format = wxDefaultDateTimeFormat, const wchar_t *format = wxDefaultDateTimeFormat,
const wxDateTime& dateDef = wxDefaultDateTime) const wxDateTime& dateDef = wxDefaultDateTime)
{ {
return ParseFormat(wxString(date), format, dateDef); return ParseFormat(date, wxString(format), dateDef);
}
const char *ParseFormat(const char *date,
const char *format = wxDefaultDateTimeFormat,
const wxDateTime& dateDef = wxDefaultDateTime)
{
return ParseFormat(wxString(date), wxString(format), dateDef);
} }
// parse a string containing the date/time in "free" format, this // parse a string containing the date/time in "free" format, this

4
src/common/datetime.cpp
View File

@@ -3395,7 +3395,7 @@ wxDateTime::ParseFormat(const wxString& date,
case _T('r'): // time as %I:%M:%S %p case _T('r'): // time as %I:%M:%S %p
{ {
wxDateTime dt; wxDateTime dt;
input = dt.ParseFormat(input, _T("%I:%M:%S %p")); input = dt.ParseFormat(input, wxS("%I:%M:%S %p"));
if ( !input ) if ( !input )
{ {
// no match // no match
@@ -3414,7 +3414,7 @@ wxDateTime::ParseFormat(const wxString& date,
case _T('R'): // time as %H:%M case _T('R'): // time as %H:%M
{ {
wxDateTime dt; wxDateTime dt;
input = dt.ParseFormat(input, _T("%H:%M")); input = dt.ParseFormat(input, wxS("%H:%M"));
if ( !input ) if ( !input )
{ {
// no match // no match