Don't infinitely recurse when setting the child focus. Without

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

diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 10e929a22a7349e7c6144d3a1c4a23c3c46786d0..546de23f8af8148cebfe54264644e71f056e182f 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;


@@ -54,12 +49,12 @@ inline wxDateTime wxDateTime::Now()
 /* static */
 inline wxDateTime wxDateTime::Today()
 {
 /* static */
 inline wxDateTime wxDateTime::Today()
 {

-    struct tm *tm = GetTmNow();
-    tm->tm_hour =
-    tm->tm_min =
-    tm->tm_sec = 0;
+    struct tm *time = GetTmNow();
+    time->tm_hour = 0;
+    time->tm_min = 0;
+    time->tm_sec = 0;

 
 

-    return wxDateTime(*tm);
+    return wxDateTime(*time);

 }
 
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
 }
 
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))


@@ -105,7 +100,8 @@ inline wxDateTime& wxDateTime::Set(const Tm& tm)
 {
     wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") );
 
 {
     wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") );
 

-    return Set(tm.mday, (Month)tm.mon, tm.year, tm.hour, tm.min, tm.sec);
+    return Set(tm.mday, (Month)tm.mon, tm.year,
+               tm.hour, tm.min, tm.sec, tm.msec);

 }
 
 inline wxDateTime::wxDateTime(wxDateTime_t hour,
 }
 
 inline wxDateTime::wxDateTime(wxDateTime_t hour,


@@ -156,7 +152,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 +188,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