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

Add wxDateTime::GetWeekBasedYear().

Browse Source 
It was just added as a private function to implement %V format specifier
support, just extract and document it as it could possibly be useful in its
own right.

See #11857.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-08-03 12:47:41 +00:00
parent 29b68052bb
commit 1b90acc357
5 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/datetimefmt.cpp
View File

@@ -271,30 +271,6 @@ GetWeekDayFromName(wxString::const_iterator& p,
return wd;
}
// return the year of the Monday of the week containing the given date
int
GetWeekBasedYear(const wxDateTime& dt)
{
const wxDateTime::Tm tm = dt.GetTm();
int year = tm.year;
// The week-based year can only be different from the normal year for few
// days in the beginning and the end of the year.
if ( tm.yday > 361 )
{
if ( dt.GetWeekOfYear() == 1 )
year++;
}
else if ( tm.yday < 5 )
{
if ( dt.GetWeekOfYear() == 53 )
year--;
}
return year;
}
// parses string starting at given iterator using the specified format and,
// optionally, a fall back format (and optionally another one... but it stops
// there, really)
@@ -623,11 +599,11 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
break;
case wxT('g'): // 2-digit week-based year
res += wxString::Format(fmt, GetWeekBasedYear(*this) % 100);
res += wxString::Format(fmt, GetWeekBasedYear() % 100);
break;
case wxT('G'): // week-based year with century
res += wxString::Format(fmt, GetWeekBasedYear(*this));
res += wxString::Format(fmt, GetWeekBasedYear());
break;
case wxT('H'): // hour in 24h format (00-23)