added operator==() and !=() for wxDateSpan

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-01-02 22:07:51 +00:00
parent e1e1272f20
commit 93401be962
2 changed files with 33 additions and 8 deletions

View File

@@ -11,6 +11,15 @@ OTHER CHANGES
2.5.0 2.5.0
----- -----
All:
- Implemented GetEditControl for wxGenericTreeCtrl (Peter Stieber)
- Improved contrib/utils/convertrc parsing (David J. Cooke)
- Fixed handling of URLs and filenames in wxFileSystem
- Implemented alignment for wxGrid bool editor and renderer
- Support wxListCtrl columns alignment for all platforms and not just MSW
- Added wxDateSpan::operator==() and !=() (Lukasz Michalski)
Unix: Unix:
- fixed compilation on systems with zlib installed but < 1.1.3 version - fixed compilation on systems with zlib installed but < 1.1.3 version
@@ -28,14 +37,6 @@ wxMSW:
- wxCheckListBox::Check() doesn't send CHECKLISTBOX_TOGGLE event any more - wxCheckListBox::Check() doesn't send CHECKLISTBOX_TOGGLE event any more
- fixed bug with wxTR_EDIT_LABELS not workign with wxTR_MULTIPLE - fixed bug with wxTR_EDIT_LABELS not workign with wxTR_MULTIPLE
All:
- Implemented GetEditControl for wxGenericTreeCtrl (Peter Stieber)
- Improved contrib/utils/convertrc parsing (David J. Cooke)
- Fixed handling of URLs and filenames in wxFileSystem
- Implemented alignment for wxGrid bool editor and renderer
- Support wxListCtrl columns alignment for all platforms and not just MSW
OLD CHANGES OLD CHANGES
=========== ===========

View File

@@ -1178,6 +1178,12 @@ private:
// Beware about weeks: if you specify both weeks and days, the total number of // Beware about weeks: if you specify both weeks and days, the total number of
// days added will be 7*weeks + days! See also GetTotalDays() function. // days added will be 7*weeks + days! See also GetTotalDays() function.
// //
// Equality operators are defined for wxDateSpans. Two datespans are equal if
// they both give the same target date when added to *every* source date.
// Thus wxDateSpan::Months(1) is not equal to wxDateSpan::Days(30), because
// they not give the same date when added to 1 Feb. But wxDateSpan::Days(14) is
// equal to wxDateSpan::Weeks(2)
//
// Finally, notice that for adding hours, minutes &c you don't need this // Finally, notice that for adding hours, minutes &c you don't need this
// class: wxTimeSpan will do the job because there are no subtleties // class: wxTimeSpan will do the job because there are no subtleties
// associated with those. // associated with those.
@@ -1524,6 +1530,24 @@ inline bool WXDLLEXPORT operator!=(const wxTimeSpan &t1, const wxTimeSpan &t2)
// wxDateSpan // wxDateSpan
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// comparison
// ----------
// ds1 == d2 if and only if for every wxDateTime t t + ds1 == t + ds2
inline WXDLLEXPORT bool operator==(const wxDateSpan& ds1,
const wxDateSpan& ds2)
{
return ds1.GetYears() == ds2.GetYears() &&
ds1.GetMonths() == ds2.GetMonths() &&
ds1.GetTotalDays() == ds2.GetTotalDays();
}
inline WXDLLEXPORT bool operator!=(const wxDateSpan& ds1,
const wxDateSpan& ds2)
{
return !(ds1 == ds2);
}
// arithmetics // arithmetics
// ----------- // -----------