Rewrote wxToolBar another time.

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

diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 450a11fc1387473956a788bc3feb4eec7d51be3d..8ec379dd9d2a212f961120789e83e8ed0f6d17d4 100644 (file)
--- a/include/wx/datetime.inl
+++ b/include/wx/datetime.inl
@@ -54,12 +54,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))


@@ -149,7 +149,7 @@ inline time_t wxDateTime::GetTicks() const
     return (time_t)((m_time / (long)TIME_T_FACTOR).GetLo())+WX_TIME_BASE_OFFSET ;
 }
 
     return (time_t)((m_time / (long)TIME_T_FACTOR).GetLo())+WX_TIME_BASE_OFFSET ;
 }
 

-bool wxDateTime::SetToLastWeekDay(WeekDay weekday,
+inline bool wxDateTime::SetToLastWeekDay(WeekDay weekday,

                                          Month month,
                                          int year)
 {
                                          Month month,
                                          int year)
 {