added dependency handling to Makefiles

[wxWidgets.git] / include / wx / date.h

diff --git a/include/wx/date.h b/include/wx/date.h
index 1b3f2e778894d4a8adab62d17f5a9baaee501dab..635457d9d3e0a81d725113d0324e7ff201e833d1 100644 (file)
--- 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
     {