don't misinterpret the time after the date as a weekday (patch 1836708)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-15 21:03:21 +00:00
parent 3f0640b0a8
commit 804eeca5d5
3 changed files with 42 additions and 3 deletions

View File

@@ -3963,8 +3963,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
}
else // not a valid month name
{
wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
if ( wday != Inv_WeekDay )
WeekDay wday2 = GetWeekDayFromName(token, Name_Full | Name_Abbr);
if ( wday2 != Inv_WeekDay )
{
// a week day
if ( haveWDay )
@@ -3972,6 +3972,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
break;
}
wday = wday2;
haveWDay = true;
}
else // not a valid weekday name