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

added non-static GetCentury(), removed default value for static GetCentury() parameter which didn't make any sense at all

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-20 13:40:11 +00:00
parent 1bf29a7a6c
commit a333edbddf
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/latex/wx/datetime.tex
View File

@@ -202,7 +202,7 @@ supported. Future versions will support other calendars.
\helpref{ConvertYearToBC}{wxdatetimeconvertyeartobc}\\ \helpref{ConvertYearToBC}{wxdatetimeconvertyeartobc}\\
\helpref{GetCurrentMonth}{wxdatetimegetcurrentmonth}\\ \helpref{GetCurrentMonth}{wxdatetimegetcurrentmonth}\\
\helpref{IsLeapYear}{wxdatetimeisleapyear}\\ \helpref{IsLeapYear}{wxdatetimeisleapyear}\\
\helpref{GetCentury}{wxdatetimegetcentury}\\ \helpref{GetCentury}{wxdatetimegetcenturystatic}\\
\helpref{GetNumberOfDays}{wxdatetimegetnumberofdays}\\ \helpref{GetNumberOfDays}{wxdatetimegetnumberofdays}\\
\helpref{GetNumberOfDays}{wxdatetimegetnumberofdays}\\ \helpref{GetNumberOfDays}{wxdatetimegetnumberofdays}\\
\helpref{GetMonthName}{wxdatetimegetmonthname}\\ \helpref{GetMonthName}{wxdatetimegetmonthname}\\
@@ -258,6 +258,7 @@ some more complicated calculations to find the answer are under the
\helpref{IsValid}{wxdatetimeisvalid}\\ \helpref{IsValid}{wxdatetimeisvalid}\\
\helpref{GetTicks}{wxdatetimegetticks}\\ \helpref{GetTicks}{wxdatetimegetticks}\\
\helpref{GetCentury}{wxdatetimegetcentury}\\
\helpref{GetYear}{wxdatetimegetyear}\\ \helpref{GetYear}{wxdatetimegetyear}\\
\helpref{GetMonth}{wxdatetimegetmonth}\\ \helpref{GetMonth}{wxdatetimegetmonth}\\
\helpref{GetDay}{wxdatetimegetday}\\ \helpref{GetDay}{wxdatetimegetday}\\
@@ -491,9 +492,9 @@ Get the current year in given calendar (only Gregorian is currently supported).
Get the current month in given calendar (only Gregorian is currently supported). Get the current month in given calendar (only Gregorian is currently supported).
\membersection{wxDateTime::GetCentury}\label{wxdatetimegetcentury} \membersection{wxDateTime::GetCentury}\label{wxdatetimegetcenturystatic}
\func{static int}{GetCentury}{\param{int }{year = Inv\_Year}} \func{static int}{GetCentury}{\param{int }{year}}
Get the current century, i.e. first two digits of the year, in given calendar Get the current century, i.e. first two digits of the year, in given calendar
(only Gregorian is currently supported). (only Gregorian is currently supported).
@@ -872,6 +873,13 @@ Returns the number of seconds since Jan 1, 1970. An assert failure will occur
if the date is not in the range covered by {\tt time\_t} type. if the date is not in the range covered by {\tt time\_t} type.
\membersection{wxDateTime::GetCentury}\label{wxdatetimegetcentury}
\constfunc{int}{GetCentury}{\param{const TimeZone\& }{tz = Local}}
Returns the century of this date.
\membersection{wxDateTime::GetYear}\label{wxdatetimegetyear} \membersection{wxDateTime::GetYear}\label{wxdatetimegetyear}
\constfunc{int}{GetYear}{\param{const TimeZone\& }{tz = Local}} \constfunc{int}{GetYear}{\param{const TimeZone\& }{tz = Local}}

5
include/wx/datetime.h
View File

@@ -503,7 +503,7 @@ public:
static bool IsLeapYear(int year = Inv_Year, Calendar cal = Gregorian); static bool IsLeapYear(int year = Inv_Year, Calendar cal = Gregorian);
// get the century (19 for 1999, 20 for 2000 and -5 for 492 BC) // get the century (19 for 1999, 20 for 2000 and -5 for 492 BC)
static int GetCentury(int year = Inv_Year); static int GetCentury(int year);
// returns the number of days in this year (356 or 355 for Gregorian // returns the number of days in this year (356 or 355 for Gregorian
// calendar usually :-) // calendar usually :-)
@@ -838,6 +838,9 @@ public:
// if the value is out of range // if the value is out of range
inline time_t GetTicks() const; inline time_t GetTicks() const;
// get the century, same as GetCentury(GetYear())
int GetCentury(const TimeZone& tz = Local) const
{ return GetCentury(GetYear(tz)); }
// get the year (returns Inv_Year if date is invalid) // get the year (returns Inv_Year if date is invalid)
int GetYear(const TimeZone& tz = Local) const int GetYear(const TimeZone& tz = Local) const
{ return GetTm(tz).year; } { return GetTm(tz).year; }