X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68ee7c47300b37e408ef9a04ec9f83af78e90817..9a74fcaf97f13a4be4c610a659acd8ea79dc363a:/include/wx/date.h diff --git a/include/wx/date.h b/include/wx/date.h index d4dd19c745..635457d9d3 100644 --- a/include/wx/date.h +++ b/include/wx/date.h @@ -81,8 +81,8 @@ public: long operator-(const wxDate &dt) const { return GetJulianDate() - dt.GetJulianDate(); } - wxDate &operator+=(long i) { m_date += wxTimeSpan::Days(i); return *this; } - wxDate &operator-=(long i) { m_date -= wxTimeSpan::Days(i); return *this; } + wxDate &operator+=(long i) { m_date += wxTimeSpan::Days((int)i); return *this; } + wxDate &operator-=(long i) { m_date -= wxTimeSpan::Days((int)i); return *this; } wxDate &operator++() { return *this += 1; } wxDate &operator++(int) { return *this += 1; } @@ -90,7 +90,7 @@ public: wxDate &operator--(int) { return *this -= 1; } #if wxUSE_STD_IOSTREAM - friend ostream WXDLLEXPORT & operator <<(ostream &os, const wxDate &dt) + friend wxSTD ostream WXDLLEXPORT & operator <<(wxSTD ostream &os, const wxDate &dt) { return os << dt.FormatDate().mb_str(); } #endif @@ -161,16 +161,16 @@ public: int GetMonth() const { return m_date.GetMonth() + 1; } // First Date Of Month - wxDate GetMonthStart() const { return(wxDate(GetMonth(), 1, GetYear())); } + wxDate GetMonthStart() const { return(wxDate(GetMonth()-1, 1, GetYear())); } // Last Date Of Month - wxDate GetMonthEnd() const { return wxDate(GetMonth()+1, 1, GetYear())-1; } + wxDate GetMonthEnd() const { return wxDate(GetMonth(), 1, GetYear())-1; } // eg. 1992 int GetYear() const { return m_date.GetYear(); } // First Date Of Year - wxDate GetYearStart() const { return wxDate(1, 1, GetYear()); } + wxDate GetYearStart() const { return wxDate(0, 1, GetYear()); } // Last Date Of Year - wxDate GetYearEnd() const { return wxDate(1, 1, GetYear()+1) - 1; } + wxDate GetYearEnd() const { return wxDate(0, 1, GetYear()+1) - 1; } bool IsBetween(const wxDate& first, const wxDate& second) const { @@ -179,11 +179,11 @@ public: wxDate Previous(int dayOfWeek) const { + wxDate prev = *this; int dow = GetDayOfWeek(); - if ( dayOfWeek <= dow ) - return *this - (dow - dayOfWeek); - else - return *this - 7 + (dayOfWeek - dow); + prev -= dayOfWeek > dow ? 7 - (dayOfWeek - dow) : dow - dayOfWeek; + + return prev; } wxString FormatDate(int type = -1) const