don't misinterpret the time after the date as a weekday (patch 1836708)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@50732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -91,6 +91,10 @@ Major new features in 2.8 release
|
|||||||
2.8.8
|
2.8.8
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
All:
|
||||||
|
|
||||||
|
- Fixed bug with parsing some dates in wxDateTime (Bob Pesner)
|
||||||
|
|
||||||
All (GUI):
|
All (GUI):
|
||||||
|
|
||||||
- Added wxWindow::GetNextSibling() and GetPrevSibling().
|
- Added wxWindow::GetNextSibling() and GetPrevSibling().
|
||||||
|
@@ -3992,8 +3992,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
|
|||||||
}
|
}
|
||||||
else // not a valid month name
|
else // not a valid month name
|
||||||
{
|
{
|
||||||
wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
|
WeekDay wday2 = GetWeekDayFromName(token, Name_Full | Name_Abbr);
|
||||||
if ( wday != Inv_WeekDay )
|
if ( wday2 != Inv_WeekDay )
|
||||||
{
|
{
|
||||||
// a week day
|
// a week day
|
||||||
if ( haveWDay )
|
if ( haveWDay )
|
||||||
@@ -4001,6 +4001,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wday = wday2;
|
||||||
|
|
||||||
haveWDay = true;
|
haveWDay = true;
|
||||||
}
|
}
|
||||||
else // not a valid weekday name
|
else // not a valid weekday name
|
||||||
|
Reference in New Issue
Block a user