Added cfref.h containing wxCFRef templated CF ref holding class and related functions.

[wxWidgets.git] / wxPython / src / _datetime.i

diff --git a/wxPython/src/_datetime.i b/wxPython/src/_datetime.i
index aba286b03521d770b8c1d9b3ba173c1b687fbde7..4a278dcd96f661bc89fdc5ac1bfe38ec5f518ccb 100644 (file)
--- a/wxPython/src/_datetime.i
+++ b/wxPython/src/_datetime.i
@@ -464,6 +464,10 @@ public:
         // resets time to 00:00:00, doesn't change the date
     wxDateTime& ResetTime();
 
+        // get the date part of this object only, i.e. the object which has the
+        // same date as this one but time of 00:00:00
+    wxDateTime GetDateOnly() const;
+    
         // the following functions don't change the values of the other
         // fields, i.e. SetMinute() won't change either hour or seconds value
 
@@ -506,10 +510,6 @@ public:
                       int n = 1,
                       Month month = Inv_Month,
                       int year = Inv_Year);
-//      wxDateTime GetWeekDay(WeekDay weekday,
-//                            int n = 1,
-//                            Month month = Inv_Month,
-//                            int year = Inv_Year);
 
         // sets to the last weekday in the given month, year
     bool SetToLastWeekDay(WeekDay weekday,
@@ -519,17 +519,6 @@ public:
                               Month month = Inv_Month,
                               int year = Inv_Year);
 
-        // sets the date to the given day of the given week in the year,
-        // returns True on success and False if given date doesn't exist (e.g.
-        // numWeek is > 53)
-    bool SetToTheWeek(wxDateTime_t numWeek, WeekDay weekday = Mon, WeekFlags flags = Monday_First);
-    wxDateTime GetWeek(wxDateTime_t numWeek, WeekDay weekday = Mon, WeekFlags flags = Monday_First);
-
-    %pythoncode {
-        SetToTheWeek = wx._deprecated(SetToTheWeek, "SetToTheWeek is deprecated, use (static) SetToWeekOfYear instead")
-        GetWeek = wx._deprecated(GetWeek, "GetWeek is deprecated, use GetWeekOfYear instead")
-    }
-            
         // returns the date corresponding to the given week day of the given
         // week (in ISO notation) of the specified year
     static wxDateTime SetToWeekOfYear(int year,
@@ -907,7 +896,6 @@ public:
     %property(RataDie, GetRataDie, doc="See `GetRataDie`");
     %property(Second, GetSecond, SetSecond, doc="See `GetSecond` and `SetSecond`");
     %property(Ticks, GetTicks, doc="See `GetTicks`");
-    %property(Week, GetWeek, doc="See `GetWeek`");
     %property(WeekDay, GetWeekDay, doc="See `GetWeekDay`");
     %property(WeekDayInSameWeek, GetWeekDayInSameWeek, doc="See `GetWeekDayInSameWeek`");
     %property(WeekOfMonth, GetWeekOfMonth, doc="See `GetWeekOfMonth`");
@@ -1070,12 +1058,12 @@ public:
          return self.Format().encode(wx.GetDefaultPyEncoding())
      }
 
-    %property(Days, GetDays, doc="See `GetDays`");
-    %property(Hours, GetHours, doc="See `GetHours`");
-    %property(Milliseconds, GetMilliseconds, doc="See `GetMilliseconds`");
-    %property(Minutes, GetMinutes, doc="See `GetMinutes`");
-    %property(Seconds, GetSeconds, doc="See `GetSeconds`");
-    %property(Weeks, GetWeeks, doc="See `GetWeeks`");
+    %property(days, GetDays, doc="See `GetDays`");
+    %property(hours, GetHours, doc="See `GetHours`");
+    %property(milliseconds, GetMilliseconds, doc="See `GetMilliseconds`");
+    %property(minutes, GetMinutes, doc="See `GetMinutes`");
+    %property(seconds, GetSeconds, doc="See `GetSeconds`");
+    %property(weeks, GetWeeks, doc="See `GetWeeks`");
 };
 
 
@@ -1202,11 +1190,11 @@ public:
         bool __ne__(const wxDateSpan* other) { return other ? (*self != *other) : true;  }
     }
 
-    %property(Days, GetDays, SetDays, doc="See `GetDays` and `SetDays`");
-    %property(Months, GetMonths, SetMonths, doc="See `GetMonths` and `SetMonths`");
-    %property(TotalDays, GetTotalDays, doc="See `GetTotalDays`");
-    %property(Weeks, GetWeeks, SetWeeks, doc="See `GetWeeks` and `SetWeeks`");
-    %property(Years, GetYears, SetYears, doc="See `GetYears` and `SetYears`");
+    %property(days, GetDays, SetDays, doc="See `GetDays` and `SetDays`");
+    %property(months, GetMonths, SetMonths, doc="See `GetMonths` and `SetMonths`");
+    %property(totalDays, GetTotalDays, doc="See `GetTotalDays`");
+    %property(weeks, GetWeeks, SetWeeks, doc="See `GetWeeks` and `SetWeeks`");
+    %property(years, GetYears, SetYears, doc="See `GetYears` and `SetYears`");
 };