added wxBookCtrlSizer; derive wxNotebookSizer from it

[wxWidgets.git] / include / wx / datetime.inl

diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 8ec379dd9d2a212f961120789e83e8ed0f6d17d4..20bcf4c58ae25bc02c57ff0047f45ecb15c165e0 100644 (file)
--- a/include/wx/datetime.inl
+++ b/include/wx/datetime.inl
@@ -35,11 +35,6 @@
 // wxDateTime construction
 // ----------------------------------------------------------------------------
 
 // wxDateTime construction
 // ----------------------------------------------------------------------------
 

-// only define this once, when included from datetime.cpp
-#ifdef wxDEFINE_TIME_CONSTANTS
-    const long wxDateTime::TIME_T_FACTOR = 1000l;
-#endif // wxDEFINE_TIME_CONSTANTS
-

 inline bool wxDateTime::IsInStdRange() const
 {
     return m_time >= 0l && (m_time / TIME_T_FACTOR) < LONG_MAX;
 inline bool wxDateTime::IsInStdRange() const
 {
     return m_time >= 0l && (m_time / TIME_T_FACTOR) < LONG_MAX;


@@ -156,7 +151,8 @@ inline bool wxDateTime::SetToLastWeekDay(WeekDay weekday,
     return SetToWeekDay(weekday, -1, month, year);
 }
 
     return SetToWeekDay(weekday, -1, month, year);
 }
 

-inline wxDateTime wxDateTime::GetWeekDayInSameWeek(WeekDay weekday) const
+inline wxDateTime wxDateTime::GetWeekDayInSameWeek(WeekDay weekday,
+                                                   WeekFlags flags) const

 {
     MODIFY_AND_RETURN( SetToWeekDayInSameWeek(weekday) );
 }
 {
     MODIFY_AND_RETURN( SetToWeekDayInSameWeek(weekday) );
 }


@@ -191,11 +187,12 @@ inline wxDateTime wxDateTime::GetLastWeekDay(WeekDay weekday,
 }
 
 inline wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,
 }
 
 inline wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,

-                                      WeekDay weekday) const
+                                      WeekDay weekday,
+                                      WeekFlags flags) const

 {
     wxDateTime dt(*this);
 
 {
     wxDateTime dt(*this);
 

-    return dt.SetToTheWeek(numWeek, weekday) ? dt : wxInvalidDateTime;
+    return dt.SetToTheWeek(numWeek, weekday, flags) ? dt : wxInvalidDateTime;

 }
 
 inline wxDateTime wxDateTime::GetLastMonthDay(Month month, int year) const
 }
 
 inline wxDateTime wxDateTime::GetLastMonthDay(Month month, int year) const