]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/datetime.cpp
Applied [ 1223122 ] [wxMSW] Proper repainting when resizing - take 2
[wxWidgets.git] / src / common / datetime.cpp
index 7e0815799cf2860a2778d1c5ff7b5ea5d1d09e22..b09fe1ef75c694a91d067104276475d089d0a09e 100644 (file)
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
+// TODO: for $DEITY sake, someone please fix the #ifdef __WXWINCE__ everywhere,
+//       the proper way to do it is to implement (subset of) wxStrftime() for
+//       CE instead of this horror!!
+
 /*
  * Implementation notes:
  *
 /*
  * Implementation notes:
  *
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 
+#ifdef __WINDOWS__
+    #include "wx/msw/wrapwin.h"
+    #include <winnls.h>
+    #ifndef __WXWINCE__
+        #include <locale.h>
+    #endif
+#endif
+
 #include "wx/datetime.h"
 #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
 
 #include "wx/datetime.h"
 #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
 
@@ -94,7 +106,7 @@ template<> void wxStringWriteValue(wxString &s , const wxDateTime &data )
     s = data.Format(wxT("%Y-%m-%d %H:%M:%S")) ;
 }
 
     s = data.Format(wxT("%Y-%m-%d %H:%M:%S")) ;
 }
 
-WX_CUSTOM_TYPE_INFO(wxDateTime)
+wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringConverter<wxDateTime>)
 
 #endif
 
 
 #endif
 
@@ -115,12 +127,26 @@ WX_CUSTOM_TYPE_INFO(wxDateTime)
     #undef HAVE_STRPTIME
 #endif // broken strptime()
 
     #undef HAVE_STRPTIME
 #endif // broken strptime()
 
+#if defined(HAVE_STRPTIME) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+    // configure detects strptime as linkable because it's in the OS X
+    // System library but MSL headers don't declare it.
+
+//    char *strptime(const char *, const char *, struct tm *);
+    // However, we DON'T want to just provide it here because we would
+    // crash and/or overwrite data when strptime from OS X tries
+    // to fill in MW's struct tm which is two fields shorter (no TZ stuff)
+    // So for now let's just say we don't have strptime
+    #undef HAVE_STRPTIME
+#endif
+
 #if defined(__MWERKS__) && wxUSE_UNICODE
     #include <wtime.h>
 #endif
 
 #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
 #if defined(__MWERKS__) && wxUSE_UNICODE
     #include <wtime.h>
 #endif
 
 #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
-    #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
+    #if defined(__WXPALMOS__)
+        #define WX_GMTOFF_IN_TM
+    #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         #define WX_TIMEZONE _timezone
     #elif defined(__MWERKS__)
         long wxmw_timezone = 28800;
         #define WX_TIMEZONE _timezone
     #elif defined(__MWERKS__)
         long wxmw_timezone = 28800;
@@ -171,7 +197,7 @@ public:
     {
         wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
 
     {
         wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
 
-        return TRUE;
+        return true;
     }
 
     virtual void OnExit()
     }
 
     virtual void OnExit()
@@ -233,6 +259,9 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
 // global data
 // ----------------------------------------------------------------------------
 
 // global data
 // ----------------------------------------------------------------------------
 
+const wxChar * wxDefaultDateTimeFormat = wxT("%c");
+const wxChar * wxDefaultTimeSpanFormat = wxT("%H:%M:%S");
+
 // in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
 // indicate an invalid wxDateTime object
 const wxDateTime wxDefaultDateTime;
 // in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
 // indicate an invalid wxDateTime object
 const wxDateTime wxDefaultDateTime;
@@ -275,8 +304,8 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
 static int GetTimeZone()
 {
 #ifdef WX_GMTOFF_IN_TM
 static int GetTimeZone()
 {
 #ifdef WX_GMTOFF_IN_TM
-    // set to TRUE when the timezone is set
-    static bool s_timezoneSet = FALSE;
+    // set to true when the timezone is set
+    static bool s_timezoneSet = false;
     static long gmtoffset = LONG_MAX; // invalid timezone
 
     // ensure that the timezone variable is set by calling localtime
     static long gmtoffset = LONG_MAX; // invalid timezone
 
     // ensure that the timezone variable is set by calling localtime
@@ -288,7 +317,7 @@ static int GetTimeZone()
         struct tm *tm;
 
         tm = localtime(&t);
         struct tm *tm;
 
         tm = localtime(&t);
-        s_timezoneSet = TRUE;
+        s_timezoneSet = true;
 
         // note that GMT offset is the opposite of time zone and so to return
         // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
 
         // note that GMT offset is the opposite of time zone and so to return
         // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
@@ -342,18 +371,25 @@ static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
             - JDN_OFFSET;
 }
 
             - JDN_OFFSET;
 }
 
+#ifndef __WXWINCE__
 // this function is a wrapper around strftime(3) adding error checking
 static wxString CallStrftime(const wxChar *format, const tm* tm)
 {
     wxChar buf[4096];
 // this function is a wrapper around strftime(3) adding error checking
 static wxString CallStrftime(const wxChar *format, const tm* tm)
 {
     wxChar buf[4096];
+    // Create temp wxString here to work around mingw/cygwin bug 1046059
+    // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435
+    wxString s;
+
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
     {
         // buffer is too small?
         wxFAIL_MSG(_T("strftime() failed"));
     }
 
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
     {
         // buffer is too small?
         wxFAIL_MSG(_T("strftime() failed"));
     }
 
-    return wxString(buf);
+    s = buf;
+    return s;
 }
 }
+#endif
 
 #ifdef HAVE_STRPTIME
 
 
 #ifdef HAVE_STRPTIME
 
@@ -500,7 +536,7 @@ static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *number)
             break;
     }
 
             break;
     }
 
-    return !!s && s.ToULong(number);
+    return !s.empty() && s.ToULong(number);
 }
 
 // scans all alphabetic characters and returns the resulting string
 }
 
 // scans all alphabetic characters and returns the resulting string
@@ -536,14 +572,14 @@ wxDateTime::Tm::Tm(const struct tm& tm, const TimeZone& tz)
               : m_tz(tz)
 {
     msec = 0;
               : m_tz(tz)
 {
     msec = 0;
-    sec = tm.tm_sec;
-    min = tm.tm_min;
-    hour = tm.tm_hour;
-    mday = tm.tm_mday;
+    sec = (wxDateTime::wxDateTime_t)tm.tm_sec;
+    min = (wxDateTime::wxDateTime_t)tm.tm_min;
+    hour = (wxDateTime::wxDateTime_t)tm.tm_hour;
+    mday = (wxDateTime::wxDateTime_t)tm.tm_mday;
     mon = (wxDateTime::Month)tm.tm_mon;
     year = 1900 + tm.tm_year;
     mon = (wxDateTime::Month)tm.tm_mon;
     year = 1900 + tm.tm_year;
-    wday = tm.tm_wday;
-    yday = tm.tm_yday;
+    wday = (wxDateTime::wxDateTime_t)tm.tm_wday;
+    yday = (wxDateTime::wxDateTime_t)tm.tm_yday;
 }
 
 bool wxDateTime::Tm::IsValid() const
 }
 
 bool wxDateTime::Tm::IsValid() const
@@ -559,7 +595,7 @@ void wxDateTime::Tm::ComputeWeekDay()
     // compute the week day from day/month/year: we use the dumbest algorithm
     // possible: just compute our JDN and then use the (simple to derive)
     // formula: weekday = (JDN + 1.5) % 7
     // compute the week day from day/month/year: we use the dumbest algorithm
     // possible: just compute our JDN and then use the (simple to derive)
     // formula: weekday = (JDN + 1.5) % 7
-    wday = (wxDateTime::WeekDay)(GetTruncatedJDN(mday, mon, year) + 2) % 7;
+    wday = (wxDateTime::wxDateTime_t)((wxDateTime::WeekDay)(GetTruncatedJDN(mday, mon, year) + 2) % 7);
 }
 
 void wxDateTime::Tm::AddMonths(int monDiff)
 }
 
 void wxDateTime::Tm::AddMonths(int monDiff)
@@ -597,7 +633,7 @@ void wxDateTime::Tm::AddDays(int dayDiff)
         dayDiff += GetNumOfDaysInMonth(year, mon);
     }
 
         dayDiff += GetNumOfDaysInMonth(year, mon);
     }
 
-    mday += dayDiff;
+    mday = (wxDateTime::wxDateTime_t)( mday + dayDiff );
     while ( mday > GetNumOfDaysInMonth(year, mon) )
     {
         mday -= GetNumOfDaysInMonth(year, mon);
     while ( mday > GetNumOfDaysInMonth(year, mon) )
     {
         mday -= GetNumOfDaysInMonth(year, mon);
@@ -691,7 +727,7 @@ bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal)
     {
         wxFAIL_MSG(_T("unknown calendar"));
 
     {
         wxFAIL_MSG(_T("unknown calendar"));
 
-        return FALSE;
+        return false;
     }
 }
 
     }
 }
 
@@ -800,8 +836,8 @@ wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(wxDateTime::Month month,
 wxString wxDateTime::GetMonthName(wxDateTime::Month month,
                                   wxDateTime::NameFlags flags)
 {
 wxString wxDateTime::GetMonthName(wxDateTime::Month month,
                                   wxDateTime::NameFlags flags)
 {
-    wxCHECK_MSG( month != Inv_Month, _T(""), _T("invalid month") );
-
+    wxCHECK_MSG( month != Inv_Month, wxEmptyString, _T("invalid month") );
+#ifndef __WXWINCE__
     // notice that we must set all the fields to avoid confusing libc (GNU one
     // gets confused to a crash if we don't do this)
     tm tm;
     // notice that we must set all the fields to avoid confusing libc (GNU one
     // gets confused to a crash if we don't do this)
     tm tm;
@@ -809,18 +845,63 @@ wxString wxDateTime::GetMonthName(wxDateTime::Month month,
     tm.tm_mon = month;
 
     return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &tm);
     tm.tm_mon = month;
 
     return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &tm);
+#else
+    wxString ret;
+    switch(month)
+    {
+        case Jan:
+            ret = (flags == Name_Abbr ? wxT("Jan"): wxT("January"));
+            break;
+        case Feb:
+            ret = (flags == Name_Abbr ? wxT("Feb"): wxT("Febuary"));
+            break;
+        case Mar:
+            ret = (flags == Name_Abbr ? wxT("Mar"): wxT("March"));
+            break;
+        case Apr:
+            ret = (flags == Name_Abbr ? wxT("Apr"): wxT("April"));
+            break;
+        case May:
+            ret = (flags == Name_Abbr ? wxT("May"): wxT("May"));
+            break;
+        case Jun:
+            ret = (flags == Name_Abbr ? wxT("Jun"): wxT("June"));
+            break;
+        case Jul:
+            ret = (flags == Name_Abbr ? wxT("Jul"): wxT("July"));
+            break;
+        case Aug:
+            ret = (flags == Name_Abbr ? wxT("Aug"): wxT("August"));
+            break;
+        case Sep:
+            ret = (flags == Name_Abbr ? wxT("Sep"): wxT("September"));
+            break;
+        case Oct:
+            ret = (flags == Name_Abbr ? wxT("Oct"): wxT("October"));
+            break;
+        case Nov:
+            ret = (flags == Name_Abbr ? wxT("Nov"): wxT("November"));
+            break;
+        case Dec:
+            ret = (flags == Name_Abbr ? wxT("Dec"): wxT("December"));
+            break;
+    }
+    return ret;
+#endif
 }
 
 /* static */
 wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
                                     wxDateTime::NameFlags flags)
 {
 }
 
 /* static */
 wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
                                     wxDateTime::NameFlags flags)
 {
-    wxCHECK_MSG( wday != Inv_WeekDay, _T(""), _T("invalid weekday") );
-
-    // take some arbitrary Sunday
+    wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, _T("invalid weekday") );
+#ifndef __WXWINCE__
+    // take some arbitrary Sunday (but notice that the day should be such that
+    // after adding wday to it below we still have a valid date, e.g. don't
+    // take 28 here!)
     tm tm;
     InitTm(tm);
     tm tm;
     InitTm(tm);
-    tm.tm_mday = 28;
+    tm.tm_mday = 21;
     tm.tm_mon = Nov;
     tm.tm_year = 99;
 
     tm.tm_mon = Nov;
     tm.tm_year = 99;
 
@@ -832,6 +913,35 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
 
     // ... and call strftime()
     return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm);
 
     // ... and call strftime()
     return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm);
+#else
+    wxString ret;
+    switch(wday)
+    {
+        case Sun:
+            ret = (flags == Name_Abbr ? wxT("Sun") : wxT("Sunday"));
+            break;
+        case Mon:
+            ret = (flags == Name_Abbr ? wxT("Mon") : wxT("Monday"));
+            break;
+        case Tue:
+            ret = (flags == Name_Abbr ? wxT("Tue") : wxT("Tuesday"));
+            break;
+        case Wed:
+            ret = (flags == Name_Abbr ? wxT("Wed") : wxT("Wednesday"));
+            break;
+        case Thu:
+            ret = (flags == Name_Abbr ? wxT("Thu") : wxT("Thursday"));
+            break;
+        case Fri:
+            ret = (flags == Name_Abbr ? wxT("Fri") : wxT("Friday"));
+            break;
+        case Sat:
+            ret = (flags == Name_Abbr ? wxT("Sat") : wxT("Saturday"));
+            break;
+    }
+    return ret;
+
+#endif
 }
 
 /* static */
 }
 
 /* static */
@@ -839,14 +949,29 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
 {
     tm tm;
     InitTm(tm);
 {
     tm tm;
     InitTm(tm);
+    wxChar buffer[64];
+    // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
+    // and causes an assertion failed if the buffer is to small (which is good) - OR -
+    // if strftime does not return anything because the format string is invalid - OR -
+    // if there are no 'am' / 'pm' tokens defined for the current locale (which is not good).
+    // wxDateTime::ParseTime will try several different formats to parse the time.
+    // As a result, GetAmPmStrings might get called, even if the current locale
+    // does not define any 'am' / 'pm' tokens. In this case, wxStrftime would
+    // assert, even though it is a perfectly legal use.
     if ( am )
     {
     if ( am )
     {
-        *am = CallStrftime(_T("%p"), &tm);
+        if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0)
+            *am = wxString(buffer);
+        else
+            *am = wxString();
     }
     if ( pm )
     {
         tm.tm_hour = 13;
     }
     if ( pm )
     {
         tm.tm_hour = 13;
-        *pm = CallStrftime(_T("%p"), &tm);
+        if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0)
+            *pm = wxString(buffer);
+        else
+            *pm = wxString();
     }
 }
 
     }
 }
 
@@ -859,7 +984,7 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
 wxDateTime::Country wxDateTime::GetCountry()
 {
     // TODO use LOCALE_ICOUNTRY setting under Win32
 wxDateTime::Country wxDateTime::GetCountry()
 {
     // TODO use LOCALE_ICOUNTRY setting under Win32
-
+#ifndef __WXWINCE__
     if ( ms_country == Country_Unknown )
     {
         // try to guess from the time zone name
     if ( ms_country == Country_Unknown )
     {
         // try to guess from the time zone name
@@ -893,6 +1018,9 @@ wxDateTime::Country wxDateTime::GetCountry()
             ms_country = USA;
         }
     }
             ms_country = USA;
         }
     }
+#else
+     ms_country = USA;
+#endif
 
     return ms_country;
 }
 
     return ms_country;
 }
@@ -985,7 +1113,7 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country)
         dt += wxTimeSpan::Hours(1);
 
         // disable DST tests because it could result in an infinite recursion!
         dt += wxTimeSpan::Hours(1);
 
         // disable DST tests because it could result in an infinite recursion!
-        dt.MakeGMT(TRUE);
+        dt.MakeGMT(true);
     }
     else switch ( country )
     {
     }
     else switch ( country )
     {
@@ -1086,7 +1214,7 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
         dt += wxTimeSpan::Hours(1);
 
         // disable DST tests because it could result in an infinite recursion!
         dt += wxTimeSpan::Hours(1);
 
         // disable DST tests because it could result in an infinite recursion!
-        dt.MakeGMT(TRUE);
+        dt.MakeGMT(true);
     }
     else switch ( country )
     {
     }
     else switch ( country )
     {
@@ -1151,16 +1279,11 @@ wxDateTime& wxDateTime::Set(const struct tm& tm)
         // less than timezone - try to make it work for this case
         if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
         {
         // less than timezone - try to make it work for this case
         if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
         {
-            // add timezone to make sure that date is in range
-            tm2.tm_sec -= GetTimeZone();
-
-            timet = mktime(&tm2);
-            if ( timet != (time_t)-1 )
-            {
-                timet += GetTimeZone();
-
-                return Set(timet);
-            }
+            return Set((time_t)(
+                       GetTimeZone() +
+                       tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
+                       tm2.tm_min * SEC_PER_MIN +
+                       tm2.tm_sec));
         }
 
         wxFAIL_MSG( _T("mktime() failed") );
         }
 
         wxFAIL_MSG( _T("mktime() failed") );
@@ -1193,12 +1316,21 @@ wxDateTime& wxDateTime::Set(wxDateTime_t hour,
 
     wxDATETIME_CHECK( tm, _T("localtime() failed") );
 
 
     wxDATETIME_CHECK( tm, _T("localtime() failed") );
 
+    // make a copy so it isn't clobbered by the call to mktime() below
+    struct tm tm1(*tm);
+
     // adjust the time
     // adjust the time
-    tm->tm_hour = hour;
-    tm->tm_min = minute;
-    tm->tm_sec = second;
+    tm1.tm_hour = hour;
+    tm1.tm_min = minute;
+    tm1.tm_sec = second;
 
 
-    (void)Set(*tm);
+    // and the DST in case it changes on this date
+    struct tm tm2(tm1);
+    mktime(&tm2);
+    if ( tm2.tm_isdst != tm1.tm_isdst )
+        tm1.tm_isdst = tm2.tm_isdst;
+
+    (void)Set(tm1);
 
     // and finally adjust milliseconds
     return SetMillisecond(millisec);
 
     // and finally adjust milliseconds
     return SetMillisecond(millisec);
@@ -1245,7 +1377,10 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
         (void)Set(tm);
 
         // and finally adjust milliseconds
         (void)Set(tm);
 
         // and finally adjust milliseconds
-        return SetMillisecond(millisec);
+        if (IsValid())
+            SetMillisecond(millisec);
+
+        return *this;
     }
     else
     {
     }
     else
     {
@@ -1274,6 +1409,17 @@ wxDateTime& wxDateTime::Set(double jdn)
 
     m_time.Assign(jdn);
 
 
     m_time.Assign(jdn);
 
+    // JDNs always suppose an UTC date, so bring it back to local time zone
+    // (also see GetJulianDayNumber() implementation)
+    long tzDiff = GetTimeZone();
+    if ( IsDST() == 1 )
+    {
+        // FIXME: again, we suppose that DST is always one hour
+        tzDiff -= 3600;
+    }
+
+    m_time += tzDiff*1000; // tzDiff is in seconds
+
     return *this;
 }
 
     return *this;
 }
 
@@ -1311,6 +1457,7 @@ wxDateTime& wxDateTime::ResetTime()
 wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
 {
     struct tm tm;
 wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
 {
     struct tm tm;
+    InitTm(tm);
 
     long year = ddt & 0xFE000000;
     year >>= 25;
 
     long year = ddt & 0xFE000000;
     year >>= 25;
@@ -1617,26 +1764,63 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
 // Weekday and monthday stuff
 // ----------------------------------------------------------------------------
 
 // Weekday and monthday stuff
 // ----------------------------------------------------------------------------
 
-bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
-                              WeekDay weekday,
-                              WeekFlags flags)
+// convert Sun, Mon, ..., Sat into 6, 0, ..., 5
+static inline int ConvertWeekDayToMondayBase(int wd)
+{
+    return wd == wxDateTime::Sun ? 6 : wd - 1;
+}
+
+/* static */
+wxDateTime
+wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd)
 {
     wxASSERT_MSG( numWeek > 0,
                   _T("invalid week number: weeks are counted from 1") );
 
 {
     wxASSERT_MSG( numWeek > 0,
                   _T("invalid week number: weeks are counted from 1") );
 
-    int year = GetYear();
+    // Jan 4 always lies in the 1st week of the year
+    wxDateTime dt(4, Jan, year);
+    dt.SetToWeekDayInSameWeek(wd);
+    dt += wxDateSpan::Weeks(numWeek - 1);
 
 
+    return dt;
+}
+
+// use a separate function to avoid warnings about using deprecated
+// SetToTheWeek in GetWeek below
+static wxDateTime
+SetToTheWeek(int year,
+             wxDateTime::wxDateTime_t numWeek,
+             wxDateTime::WeekDay weekday,
+             wxDateTime::WeekFlags flags)
+{
     // Jan 4 always lies in the 1st week of the year
     // Jan 4 always lies in the 1st week of the year
-    Set(4, Jan, year);
-    SetToWeekDayInSameWeek(weekday, flags) += wxDateSpan::Weeks(numWeek - 1);
+    wxDateTime dt(4, wxDateTime::Jan, year);
+    dt.SetToWeekDayInSameWeek(weekday, flags);
+    dt += wxDateSpan::Weeks(numWeek - 1);
 
 
+    return dt;
+}
+
+bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
+                              WeekDay weekday,
+                              WeekFlags flags)
+{
+    int year = GetYear();
+    *this = ::SetToTheWeek(year, numWeek, weekday, flags);
     if ( GetYear() != year )
     {
         // oops... numWeek was too big
     if ( GetYear() != year )
     {
         // oops... numWeek was too big
-        return FALSE;
+        return false;
     }
 
     }
 
-    return TRUE;
+    return true;
+}
+
+wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,
+                               WeekDay weekday,
+                               WeekFlags flags) const
+{
+    return ::SetToTheWeek(GetYear(), numWeek, weekday, flags);
 }
 
 wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
 }
 
 wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
@@ -1655,8 +1839,9 @@ wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)
 {
     wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
 
 {
     wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
 
-    int wdayThis = GetWeekDay();
-    if ( weekday == wdayThis )
+    int wdayDst = weekday,
+        wdayThis = GetWeekDay();
+    if ( wdayDst == wdayThis )
     {
         // nothing to do
         return *this;
     {
         // nothing to do
         return *this;
@@ -1670,21 +1855,23 @@ wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)
     // the logic below based on comparing weekday and wdayThis works if Sun (0)
     // is the first day in the week, but breaks down for Monday_First case so
     // we adjust the week days in this case
     // the logic below based on comparing weekday and wdayThis works if Sun (0)
     // is the first day in the week, but breaks down for Monday_First case so
     // we adjust the week days in this case
-    if( flags == Monday_First )
+    if ( flags == Monday_First )
     {
         if ( wdayThis == Sun )
             wdayThis += 7;
     {
         if ( wdayThis == Sun )
             wdayThis += 7;
+        if ( wdayDst == Sun )
+            wdayDst += 7;
     }
     //else: Sunday_First, nothing to do
 
     // go forward or back in time to the day we want
     }
     //else: Sunday_First, nothing to do
 
     // go forward or back in time to the day we want
-    if ( weekday < wdayThis )
+    if ( wdayDst < wdayThis )
     {
     {
-        return Subtract(wxDateSpan::Days(wdayThis - weekday));
+        return Subtract(wxDateSpan::Days(wdayThis - wdayDst));
     }
     else // weekday > wdayThis
     {
     }
     else // weekday > wdayThis
     {
-        return Add(wxDateSpan::Days(weekday - wdayThis));
+        return Add(wxDateSpan::Days(wdayDst - wdayThis));
     }
 }
 
     }
 }
 
@@ -1741,9 +1928,9 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday,
                               Month month,
                               int year)
 {
                               Month month,
                               int year)
 {
-    wxCHECK_MSG( weekday != Inv_WeekDay, FALSE, _T("invalid weekday") );
+    wxCHECK_MSG( weekday != Inv_WeekDay, false, _T("invalid weekday") );
 
 
-    // we don't check explicitly that -5 <= n <= 5 because we will return FALSE
+    // we don't check explicitly that -5 <= n <= 5 because we will return false
     // anyhow in such case - but may be should still give an assert for it?
 
     // take the current month/year if none specified
     // anyhow in such case - but may be should still give an assert for it?
 
     // take the current month/year if none specified
@@ -1795,52 +1982,87 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday,
     {
         *this = dt;
 
     {
         *this = dt;
 
-        return TRUE;
+        return true;
     }
     else
     {
         // no such day in this month
     }
     else
     {
         // no such day in this month
-        return FALSE;
+        return false;
     }
 }
 
     }
 }
 
-wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
+static inline
+wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm)
 {
 {
-    Tm tm(GetTm(tz));
+    return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday);
+}
 
 
-    return gs_cumulatedDays[IsLeapYear(tm.year)][tm.mon] + tm.mday;
+wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
+{
+    return GetDayOfYearFromTm(GetTm(tz));
 }
 
 }
 
-wxDateTime::wxDateTime_t wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags,
-                                                   const TimeZone& tz) const
+wxDateTime::wxDateTime_t
+wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const
 {
     if ( flags == Default_First )
     {
         flags = GetCountry() == USA ? Sunday_First : Monday_First;
     }
 
 {
     if ( flags == Default_First )
     {
         flags = GetCountry() == USA ? Sunday_First : Monday_First;
     }
 
-    wxDateTime_t nDayInYear = GetDayOfYear(tz);
-    wxDateTime_t week;
+    Tm tm(GetTm(tz));
+    wxDateTime_t nDayInYear = GetDayOfYearFromTm(tm);
 
 
-    WeekDay wd = GetWeekDay(tz);
+    int wdTarget = GetWeekDay(tz);
+    int wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
+    int week;
     if ( flags == Sunday_First )
     {
     if ( flags == Sunday_First )
     {
-        week = (nDayInYear - wd + 7) / 7;
+        // FIXME: First week is not calculated correctly.
+        week = (nDayInYear - wdTarget + 7) / 7;
+        if ( wdYearStart == Wed || wdYearStart == Thu )
+            week++;
     }
     }
-    else
+    else // week starts with monday
     {
     {
-        // have to shift the week days values
-        week = (nDayInYear - (wd - 1 + 7) % 7 + 7) / 7;
-    }
+        // adjust the weekdays to non-US style.
+        wdYearStart = ConvertWeekDayToMondayBase(wdYearStart);
+        wdTarget = ConvertWeekDayToMondayBase(wdTarget);
 
 
-    // FIXME some more elegant way??
-    WeekDay wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
-    if ( wdYearStart == Wed || wdYearStart == Thu )
-    {
-        week++;
+        // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html:
+        //
+        //      Week 01 of a year is per definition the first week that has the
+        //      Thursday in this year, which is equivalent to the week that
+        //      contains the fourth day of January. In other words, the first
+        //      week of a new year is the week that has the majority of its
+        //      days in the new year. Week 01 might also contain days from the
+        //      previous year and the week before week 01 of a year is the last
+        //      week (52 or 53) of the previous year even if it contains days
+        //      from the new year. A week starts with Monday (day 1) and ends
+        //      with Sunday (day 7).
+        //
+
+        // if Jan 1 is Thursday or less, it is in the first week of this year
+        if ( wdYearStart < 4 )
+        {
+            // count the number of entire weeks between Jan 1 and this date
+            week = (nDayInYear + wdYearStart + 6 - wdTarget)/7;
+
+            // be careful to check for overflow in the next year
+            if ( week == 53 && tm.mday - wdTarget > 28 )
+                    week = 1;
+        }
+        else // Jan 1 is in the last week of the previous year
+        {
+            // check if we happen to be at the last week of previous year:
+            if ( tm.mon == Jan && tm.mday < 8 - wdYearStart )
+                week = wxDateTime(31, Dec, GetYear()-1).GetWeekOfYear();
+            else
+                week = (nDayInYear + wdYearStart - 1 - wdTarget)/7;
+        }
     }
 
     }
 
-    return week;
+    return (wxDateTime::wxDateTime_t)week;
 }
 
 wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
 }
 
 wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
@@ -1871,9 +2093,9 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
         // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
         // don't need it neither - because of the CHECK above we know that
         // yday lies in December then
         // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
         // don't need it neither - because of the CHECK above we know that
         // yday lies in December then
-        if ( (mon == Dec) || (yday < gs_cumulatedDays[isLeap][mon + 1]) )
+        if ( (mon == Dec) || (yday <= gs_cumulatedDays[isLeap][mon + 1]) )
         {
         {
-            Set(yday - gs_cumulatedDays[isLeap][mon], mon, year);
+            Set((wxDateTime::wxDateTime_t)(yday - gs_cumulatedDays[isLeap][mon]), mon, year);
 
             break;
         }
 
             break;
         }
@@ -1888,8 +2110,8 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
 
 double wxDateTime::GetJulianDayNumber() const
 {
 
 double wxDateTime::GetJulianDayNumber() const
 {
-    // JDN are always expressed for the GMT dates
-    Tm tm(ToTimezone(GMT0).GetTm(GMT0));
+    // JDN are always expressed for the UTC dates
+    Tm tm(ToTimezone(UTC).GetTm(UTC));
 
     double result = GetTruncatedJDN(tm.mday, tm.mon, tm.year);
 
 
     double result = GetTruncatedJDN(tm.mday, tm.mon, tm.year);
 
@@ -1960,7 +2182,7 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
 
 wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
 {
 
 wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
 {
-    wxCHECK_MSG( format, _T(""), _T("NULL format in wxDateTime::Format") );
+    wxCHECK_MSG( format, wxEmptyString, _T("NULL format in wxDateTime::Format") );
 
     // we have to use our own implementation if the date is out of range of
     // strftime() or if we use non standard specificators
 
     // we have to use our own implementation if the date is out of range of
     // strftime() or if we use non standard specificators
@@ -1998,11 +2220,13 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                 tm = (struct tm *)NULL;
             }
         }
                 tm = (struct tm *)NULL;
             }
         }
-
+#ifndef __WXWINCE__
+    //Windows CE doesn't support strftime or wcsftime, so we use the generic implementation
         if ( tm )
         {
             return CallStrftime(format, tm);
         }
         if ( tm )
         {
             return CallStrftime(format, tm);
         }
+#endif
         //else: use generic code below
     }
 
         //else: use generic code below
     }
 
@@ -2058,17 +2282,17 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                 fmt = _T("%02d");
         }
 
                 fmt = _T("%02d");
         }
 
-        bool restart = TRUE;
+        bool restart = true;
         while ( restart )
         {
         while ( restart )
         {
-            restart = FALSE;
+            restart = false;
 
             // start of the format specification
             switch ( *p )
             {
                 case _T('a'):       // a weekday name
                 case _T('A'):
 
             // start of the format specification
             switch ( *p )
             {
                 case _T('a'):       // a weekday name
                 case _T('A'):
-                    // second parameter should be TRUE for abbreviated names
+                    // second parameter should be true for abbreviated names
                     res += GetWeekDayName(tm.GetWeekDay(),
                                           *p == _T('a') ? Name_Abbr : Name_Full);
                     break;
                     res += GetWeekDayName(tm.GetWeekDay(),
                                           *p == _T('a') ? Name_Abbr : Name_Full);
                     break;
@@ -2081,6 +2305,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
 
                 case _T('c'):       // locale default date and time  representation
                 case _T('x'):       // locale default date representation
 
                 case _T('c'):       // locale default date and time  representation
                 case _T('x'):       // locale default date representation
+#ifndef __WXWINCE__
                     //
                     // the problem: there is no way to know what do these format
                     // specifications correspond to for the current locale.
                     //
                     // the problem: there is no way to know what do these format
                     // specifications correspond to for the current locale.
@@ -2089,12 +2314,12 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                     // find the YEAR which is a year in the strftime() range (1970
                     // - 2038) whose Jan 1 falls on the same week day as the Jan 1
                     // of the real year. Then make a copy of the format and
                     // find the YEAR which is a year in the strftime() range (1970
                     // - 2038) whose Jan 1 falls on the same week day as the Jan 1
                     // of the real year. Then make a copy of the format and
-                    // replace all occurences of YEAR in it with some unique
+                    // replace all occurrences of YEAR in it with some unique
                     // string not appearing anywhere else in it, then use
                     // strftime() to format the date in year YEAR and then replace
                     // YEAR back by the real year and the unique replacement
                     // string not appearing anywhere else in it, then use
                     // strftime() to format the date in year YEAR and then replace
                     // YEAR back by the real year and the unique replacement
-                    // string back with YEAR. Notice that "all occurences of YEAR"
-                    // means all occurences of 4 digit as well as 2 digit form!
+                    // string back with YEAR. Notice that "all occurrences of YEAR"
+                    // means all occurrences of 4 digit as well as 2 digit form!
                     //
                     // the bugs: we assume that neither of %c nor %x contains any
                     // fields which may change between the YEAR and real year. For
                     //
                     // the bugs: we assume that neither of %c nor %x contains any
                     // fields which may change between the YEAR and real year. For
@@ -2152,8 +2377,8 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                         strYear.Printf(_T("%d"), year);
                         strYear2.Printf(_T("%d"), year % 100);
 
                         strYear.Printf(_T("%d"), year);
                         strYear2.Printf(_T("%d"), year % 100);
 
-                        // find two strings not occuring in format (this is surely
-                        // not optimal way of doing it... improvements welcome!)
+                        // find two strings not occurring in format (this is surely
+                        // not the optimal way of doing it... improvements welcome!)
                         wxString fmt = format;
                         wxString replacement = (wxChar)-1;
                         while ( fmt.Find(replacement) != wxNOT_FOUND )
                         wxString fmt = format;
                         wxString replacement = (wxChar)-1;
                         while ( fmt.Find(replacement) != wxNOT_FOUND )
@@ -2167,7 +2392,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                             replacement << (wxChar)-2;
                         }
 
                             replacement << (wxChar)-2;
                         }
 
-                        // replace all occurences of year with it
+                        // replace all occurrences of year with it
                         bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
                         if ( !wasReplaced )
                             wasReplaced = fmt.Replace(strYear2, replacement2) > 0;
                         bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
                         if ( !wasReplaced )
                             wasReplaced = fmt.Replace(strYear2, replacement2) > 0;
@@ -2194,14 +2419,14 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                                                                   : _T("%x"),
                                                     &tmAdjusted);
 
                                                                   : _T("%x"),
                                                     &tmAdjusted);
 
-                        // now replace the occurence of 1999 with the real year
+                        // now replace the occurrence of 1999 with the real year
                         wxString strYearReal, strYearReal2;
                         strYearReal.Printf(_T("%04d"), yearReal);
                         strYearReal2.Printf(_T("%02d"), yearReal % 100);
                         str.Replace(strYear, strYearReal);
                         str.Replace(strYear2, strYearReal2);
 
                         wxString strYearReal, strYearReal2;
                         strYearReal.Printf(_T("%04d"), yearReal);
                         strYearReal2.Printf(_T("%02d"), yearReal % 100);
                         str.Replace(strYear, strYearReal);
                         str.Replace(strYear2, strYearReal2);
 
-                        // and replace back all occurences of replacement string
+                        // and replace back all occurrences of replacement string
                         if ( wasReplaced )
                         {
                             str.Replace(replacement2, strYear2);
                         if ( wasReplaced )
                         {
                             str.Replace(replacement2, strYear2);
@@ -2210,6 +2435,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
 
                         res += str;
                     }
 
                         res += str;
                     }
+#else
+                    //Use "%m/%d/%y %H:%M:%S" format instead
+                    res += wxString::Format(wxT("%02d/%02d/%04d %02d:%02d:%02d"),
+                            tm.mon+1,tm.mday, tm.year, tm.hour, tm.min, tm.sec);
+#endif
                     break;
 
                 case _T('d'):       // day of a month (01-31)
                     break;
 
                 case _T('d'):       // day of a month (01-31)
@@ -2246,7 +2476,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                     break;
 
                 case _T('p'):       // AM or PM string
                     break;
 
                 case _T('p'):       // AM or PM string
+#ifndef __WXWINCE__
                     res += CallStrftime(_T("%p"), &tmTimeOnly);
                     res += CallStrftime(_T("%p"), &tmTimeOnly);
+#else
+                    res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");
+#endif
                     break;
 
                 case _T('S'):       // second as a decimal number (00-61)
                     break;
 
                 case _T('S'):       // second as a decimal number (00-61)
@@ -2269,7 +2503,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
 
                 case _T('X'):       // locale default time representation
                     // just use strftime() to format the time for us
 
                 case _T('X'):       // locale default time representation
                     // just use strftime() to format the time for us
+#ifndef __WXWINCE__
                     res += CallStrftime(_T("%X"), &tmTimeOnly);
                     res += CallStrftime(_T("%X"), &tmTimeOnly);
+#else
+                    res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec);
+#endif
                     break;
 
                 case _T('y'):       // year without century (00-99)
                     break;
 
                 case _T('y'):       // year without century (00-99)
@@ -2281,7 +2519,9 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                     break;
 
                 case _T('Z'):       // timezone name
                     break;
 
                 case _T('Z'):       // timezone name
+#ifndef __WXWINCE__
                     res += CallStrftime(_T("%Z"), &tmTimeOnly);
                     res += CallStrftime(_T("%Z"), &tmTimeOnly);
+#endif
                     break;
 
                 default:
                     break;
 
                 default:
@@ -2293,13 +2533,13 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                         fmt += *p;
                     }
 
                         fmt += *p;
                     }
 
-                    if ( !fmt.IsEmpty() )
+                    if ( !fmt.empty() )
                     {
                         // we've only got the flags and width so far in fmt
                         fmt.Prepend(_T('%'));
                         fmt.Append(_T('d'));
 
                     {
                         // we've only got the flags and width so far in fmt
                         fmt.Prepend(_T('%'));
                         fmt.Append(_T('d'));
 
-                        restart = TRUE;
+                        restart = true;
 
                         break;
                     }
 
                         break;
                     }
@@ -2366,11 +2606,11 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
         return (wxChar *)NULL;
     }
 
         return (wxChar *)NULL;
     }
 
-    wxDateTime_t day = *p++ - _T('0');
+    wxDateTime_t day = (wxDateTime_t)(*p++ - _T('0'));
     if ( wxIsdigit(*p) )
     {
         day *= 10;
     if ( wxIsdigit(*p) )
     {
         day *= 10;
-        day += *p++ - _T('0');
+        day = (wxDateTime_t)(day + (*p++ - _T('0')));
     }
 
     if ( *p++ != _T(' ') )
     }
 
     if ( *p++ != _T(' ') )
@@ -2464,7 +2704,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
         return (wxChar *)NULL;
     }
 
         return (wxChar *)NULL;
     }
 
-    wxDateTime_t hour = *p++ - _T('0');
+    wxDateTime_t hour = (wxDateTime_t)(*p++ - _T('0'));
 
     if ( !wxIsdigit(*p) )
     {
 
     if ( !wxIsdigit(*p) )
     {
@@ -2472,7 +2712,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
     }
 
     hour *= 10;
     }
 
     hour *= 10;
-    hour += *p++ - _T('0');
+    hour = (wxDateTime_t)(hour + (*p++ - _T('0')));
 
     if ( *p++ != _T(':') )
     {
 
     if ( *p++ != _T(':') )
     {
@@ -2484,7 +2724,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
         return (wxChar *)NULL;
     }
 
         return (wxChar *)NULL;
     }
 
-    wxDateTime_t min = *p++ - _T('0');
+    wxDateTime_t min = (wxDateTime_t)(*p++ - _T('0'));
 
     if ( !wxIsdigit(*p) )
     {
 
     if ( !wxIsdigit(*p) )
     {
@@ -2492,7 +2732,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
     }
 
     min *= 10;
     }
 
     min *= 10;
-    min += *p++ - _T('0');
+    min = (wxDateTime_t)(min + *p++ - _T('0'));
 
     wxDateTime_t sec = 0;
     if ( *p++ == _T(':') )
 
     wxDateTime_t sec = 0;
     if ( *p++ == _T(':') )
@@ -2502,7 +2742,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
             return (wxChar *)NULL;
         }
 
             return (wxChar *)NULL;
         }
 
-        sec = *p++ - _T('0');
+        sec = (wxDateTime_t)(*p++ - _T('0'));
 
         if ( !wxIsdigit(*p) )
         {
 
         if ( !wxIsdigit(*p) )
         {
@@ -2510,7 +2750,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
         }
 
         sec *= 10;
         }
 
         sec *= 10;
-        sec += *p++ - _T('0');
+        sec = (wxDateTime_t)(sec + *p++ - _T('0'));
     }
 
     if ( *p++ != _T(' ') )
     }
 
     if ( *p++ != _T(' ') )
@@ -2519,7 +2759,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
     }
 
     // and now the interesting part: the timezone
     }
 
     // and now the interesting part: the timezone
-    int offset;
+    int offset wxDUMMY_INITIALIZE(0);
     if ( *p == _T('-') || *p == _T('+') )
     {
         // the explicit offset given: it has the form of hhmm
     if ( *p == _T('-') || *p == _T('+') )
     {
         // the explicit offset given: it has the form of hhmm
@@ -2621,6 +2861,166 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
     return p;
 }
 
     return p;
 }
 
+#ifdef __WINDOWS__
+
+// returns the string containing strftime() format used for short dates in the
+// current locale or an empty string
+static wxString GetLocaleDateFormat()
+{
+    wxString fmtWX;
+
+    // there is no setlocale() under Windows CE, so just always query the
+    // system there
+#ifndef __WXWINCE__
+    if ( strcmp(setlocale(LC_ALL, NULL), "C") != 0 )
+#endif
+    {
+        // The locale was programatically set to non-C. We assume that this was
+        // done using wxLocale, in which case thread's current locale is also
+        // set to correct LCID value and we can use GetLocaleInfo to determine
+        // the correct formatting string:
+#ifdef __WXWINCE__
+        LCID lcid = LOCALE_USER_DEFAULT;
+#else
+        LCID lcid = GetThreadLocale();
+#endif
+        // according to MSDN 80 chars is max allowed for short date format
+        wxChar fmt[81];
+        if ( ::GetLocaleInfo(lcid, LOCALE_SSHORTDATE, fmt, WXSIZEOF(fmt)) )
+        {
+            wxChar chLast = _T('\0');
+            size_t lastCount = 0;
+            for ( const wxChar *p = fmt; /* NUL handled inside */; p++ )
+            {
+                if ( *p == chLast )
+                {
+                    lastCount++;
+                    continue;
+                }
+
+                switch ( *p )
+                {
+                    // these characters come in groups, start counting them
+                    case _T('d'):
+                    case _T('M'):
+                    case _T('y'):
+                    case _T('g'):
+                        chLast = *p;
+                        lastCount = 1;
+                        break;
+
+                    default:
+                        // first deal with any special characters we have had
+                        if ( lastCount )
+                        {
+                            switch ( chLast )
+                            {
+                                case _T('d'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // d
+                                        case 2: // dd
+                                            // these two are the same as we
+                                            // don't distinguish between 1 and
+                                            // 2 digits for days
+                                            fmtWX += _T("%d");
+                                            break;
+
+                                        case 3: // ddd
+                                            fmtWX += _T("%a");
+                                            break;
+
+                                        case 4: // dddd
+                                            fmtWX += _T("%A");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("too many 'd's") );
+                                    }
+                                    break;
+
+                                case _T('M'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // M
+                                        case 2: // MM
+                                            // as for 'd' and 'dd' above
+                                            fmtWX += _T("%m");
+                                            break;
+
+                                        case 3:
+                                            fmtWX += _T("%b");
+                                            break;
+
+                                        case 4:
+                                            fmtWX += _T("%B");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("too many 'M's") );
+                                    }
+                                    break;
+
+                                case _T('y'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // y
+                                        case 2: // yy
+                                            fmtWX += _T("%y");
+                                            break;
+
+                                        case 4: // yyyy
+                                            fmtWX += _T("%Y");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("wrong number of 'y's") );
+                                    }
+                                    break;
+
+                                case _T('g'):
+                                    // strftime() doesn't have era string,
+                                    // ignore this format
+                                    wxASSERT_MSG( lastCount <= 2,
+                                                  _T("too many 'g's") );
+                                    break;
+
+                                default:
+                                    wxFAIL_MSG( _T("unreachable") );
+                            }
+
+                            chLast = _T('\0');
+                            lastCount = 0;
+                        }
+
+                        // not a special character so must be just a separator,
+                        // treat as is
+                        if ( *p != _T('\0') )
+                        {
+                            if ( *p == _T('%') )
+                            {
+                                // this one needs to be escaped
+                                fmtWX += _T('%');
+                            }
+
+                            fmtWX += *p;
+                        }
+                }
+
+                if ( *p == _T('\0') )
+                    break;
+            }
+        }
+        //else: GetLocaleInfo() failed, leave fmtDate value unchanged and
+        //      try our luck with the default formats
+    }
+    //else: default C locale, default formats should work
+
+    return fmtWX;
+}
+
+#endif // __WINDOWS__
+
 const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                                       const wxChar *format,
                                       const wxDateTime& dateDef)
 const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                                       const wxChar *format,
                                       const wxDateTime& dateDef)
@@ -2632,17 +3032,17 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
     unsigned long num;
 
     // what fields have we found?
     unsigned long num;
 
     // what fields have we found?
-    bool haveWDay = FALSE,
-         haveYDay = FALSE,
-         haveDay = FALSE,
-         haveMon = FALSE,
-         haveYear = FALSE,
-         haveHour = FALSE,
-         haveMin = FALSE,
-         haveSec = FALSE;
-
-    bool hourIsIn12hFormat = FALSE, // or in 24h one?
-         isPM = FALSE;              // AM by default
+    bool haveWDay = false,
+         haveYDay = false,
+         haveDay = false,
+         haveMon = false,
+         haveYear = false,
+         haveHour = false,
+         haveMin = false,
+         haveSec = false;
+
+    bool hourIsIn12hFormat = false, // or in 24h one?
+         isPM = false;              // AM by default
 
     // and the value of the items we have (init them to get rid of warnings)
     wxDateTime_t sec = 0,
 
     // and the value of the items we have (init them to get rid of warnings)
     wxDateTime_t sec = 0,
@@ -2731,7 +3131,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                         return (wxChar *)NULL;
                     }
                 }
                         return (wxChar *)NULL;
                     }
                 }
-                haveWDay = TRUE;
+                haveWDay = true;
                 break;
 
             case _T('b'):       // a month name
                 break;
 
             case _T('b'):       // a month name
@@ -2745,7 +3145,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                         return (wxChar *)NULL;
                     }
                 }
                         return (wxChar *)NULL;
                     }
                 }
-                haveMon = TRUE;
+                haveMon = true;
                 break;
 
             case _T('c'):       // locale default date and time  representation
                 break;
 
             case _T('c'):       // locale default date and time  representation
@@ -2776,7 +3176,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     Tm tm = dt.GetTm();
 
                     haveDay = haveMon = haveYear =
                     Tm tm = dt.GetTm();
 
                     haveDay = haveMon = haveYear =
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
 
                     hour = tm.hour;
                     min = tm.min;
 
                     hour = tm.hour;
                     min = tm.min;
@@ -2800,7 +3200,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
 
                 // we can't check whether the day range is correct yet, will
                 // do it later - assume ok for now
 
                 // we can't check whether the day range is correct yet, will
                 // do it later - assume ok for now
-                haveDay = TRUE;
+                haveDay = true;
                 mday = (wxDateTime_t)num;
                 break;
 
                 mday = (wxDateTime_t)num;
                 break;
 
@@ -2811,7 +3211,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveHour = TRUE;
+                haveHour = true;
                 hour = (wxDateTime_t)num;
                 break;
 
                 hour = (wxDateTime_t)num;
                 break;
 
@@ -2822,8 +3222,8 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveHour = TRUE;
-                hourIsIn12hFormat = TRUE;
+                haveHour = true;
+                hourIsIn12hFormat = true;
                 hour = (wxDateTime_t)(num % 12);        // 12 should be 0
                 break;
 
                 hour = (wxDateTime_t)(num % 12);        // 12 should be 0
                 break;
 
@@ -2834,7 +3234,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveYDay = TRUE;
+                haveYDay = true;
                 yday = (wxDateTime_t)num;
                 break;
 
                 yday = (wxDateTime_t)num;
                 break;
 
@@ -2845,7 +3245,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveMon = TRUE;
+                haveMon = true;
                 mon = (Month)(num - 1);
                 break;
 
                 mon = (Month)(num - 1);
                 break;
 
@@ -2856,7 +3256,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveMin = TRUE;
+                haveMin = true;
                 min = (wxDateTime_t)num;
                 break;
 
                 min = (wxDateTime_t)num;
                 break;
 
@@ -2865,9 +3265,11 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     wxString am, pm, token = GetAlphaToken(input);
 
                     GetAmPmStrings(&am, &pm);
                     wxString am, pm, token = GetAlphaToken(input);
 
                     GetAmPmStrings(&am, &pm);
+                    if (am.empty() && pm.empty())
+                        return (wxChar *)NULL;  // no am/pm strings defined
                     if ( token.CmpNoCase(pm) == 0 )
                     {
                     if ( token.CmpNoCase(pm) == 0 )
                     {
-                        isPM = TRUE;
+                        isPM = true;
                     }
                     else if ( token.CmpNoCase(am) != 0 )
                     {
                     }
                     else if ( token.CmpNoCase(am) != 0 )
                     {
@@ -2887,7 +3289,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                         return (wxChar *)NULL;
                     }
 
                         return (wxChar *)NULL;
                     }
 
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
@@ -2906,12 +3308,13 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                         return (wxChar *)NULL;
                     }
 
                         return (wxChar *)NULL;
                     }
 
-                    haveHour = haveMin = TRUE;
+                    haveHour = haveMin = true;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
                     min = tm.min;
                 }
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
                     min = tm.min;
                 }
+                break;
 
             case _T('S'):       // second as a decimal number (00-61)
                 if ( !GetNumericToken(width, input, &num) || (num > 61) )
 
             case _T('S'):       // second as a decimal number (00-61)
                 if ( !GetNumericToken(width, input, &num) || (num > 61) )
@@ -2920,7 +3323,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveSec = TRUE;
+                haveSec = true;
                 sec = (wxDateTime_t)num;
                 break;
 
                 sec = (wxDateTime_t)num;
                 break;
 
@@ -2934,7 +3337,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                         return (wxChar *)NULL;
                     }
 
                         return (wxChar *)NULL;
                     }
 
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
@@ -2950,7 +3353,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveWDay = TRUE;
+                haveWDay = true;
                 wday = (WeekDay)num;
                 break;
 
                 wday = (WeekDay)num;
                 break;
 
@@ -2967,7 +3370,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     {
                         input = result;
 
                     {
                         input = result;
 
-                        haveDay = haveMon = haveYear = TRUE;
+                        haveDay = haveMon = haveYear = true;
 
                         year = 1900 + tm.tm_year;
                         mon = (Month)tm.tm_mon;
 
                         year = 1900 + tm.tm_year;
                         mon = (Month)tm.tm_mon;
@@ -2978,26 +3381,34 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 }
 #endif // HAVE_STRPTIME
 
                 }
 #endif // HAVE_STRPTIME
 
-                // TODO query the LOCALE_IDATE setting under Win32
                 {
                     wxDateTime dt;
                 {
                     wxDateTime dt;
-
-                    wxString fmtDate, fmtDateAlt;
-                    if ( IsWestEuropeanCountry(GetCountry()) ||
-                         GetCountry() == Russia )
-                    {
-                        fmtDate = _T("%d/%m/%y");
-                        fmtDateAlt = _T("%m/%d/%y");
-                    }
-                    else // assume USA
+                    wxString fmtDate,
+                             fmtDateAlt;
+
+#ifdef __WINDOWS__
+                    // The above doesn't work for all locales, try to query
+                    // Windows for the right way of formatting the date:
+                    fmtDate = GetLocaleDateFormat();
+                    if ( fmtDate.empty() )
+#endif
                     {
                     {
-                        fmtDate = _T("%m/%d/%y");
-                        fmtDateAlt = _T("%d/%m/%y");
+                        if ( IsWestEuropeanCountry(GetCountry()) ||
+                             GetCountry() == Russia )
+                        {
+                            fmtDate = _T("%d/%m/%y");
+                            fmtDateAlt = _T("%m/%d/%y");
+                        }
+                        else // assume USA
+                        {
+                            fmtDate = _T("%m/%d/%y");
+                            fmtDateAlt = _T("%d/%m/%y");
+                        }
                     }
 
                     const wxChar *result = dt.ParseFormat(input, fmtDate);
 
                     }
 
                     const wxChar *result = dt.ParseFormat(input, fmtDate);
 
-                    if ( !result )
+                    if ( !result && !fmtDateAlt.empty() )
                     {
                         // ok, be nice and try another one
                         result = dt.ParseFormat(input, fmtDateAlt);
                     {
                         // ok, be nice and try another one
                         result = dt.ParseFormat(input, fmtDateAlt);
@@ -3011,7 +3422,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
 
                     Tm tm = dt.GetTm();
 
 
                     Tm tm = dt.GetTm();
 
-                    haveDay = haveMon = haveYear = TRUE;
+                    haveDay = haveMon = haveYear = true;
 
                     year = tm.year;
                     mon = tm.mon;
 
                     year = tm.year;
                     mon = tm.mon;
@@ -3033,7 +3444,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                         return (wxChar *)NULL;
                     }
 
                         return (wxChar *)NULL;
                     }
 
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
 
                     hour = tm.tm_hour;
                     min = tm.tm_min;
 
                     hour = tm.tm_hour;
                     min = tm.tm_min;
@@ -3061,7 +3472,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                         return (wxChar *)NULL;
                     }
 
                         return (wxChar *)NULL;
                     }
 
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;
@@ -3080,7 +3491,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveYear = TRUE;
+                haveYear = true;
 
                 // TODO should have an option for roll over date instead of
                 //      hard coding it here
 
                 // TODO should have an option for roll over date instead of
                 //      hard coding it here
@@ -3094,7 +3505,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 
-                haveYear = TRUE;
+                haveYear = true;
                 year = (wxDateTime_t)num;
                 break;
 
                 year = (wxDateTime_t)num;
                 break;
 
@@ -3217,11 +3628,48 @@ const wxChar *wxDateTime::ParseDateTime(const wxChar *date)
 {
     wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
 
 {
     wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
 
-    // there is a public domain version of getdate.y, but it only works for
-    // English...
-    wxFAIL_MSG(_T("TODO"));
+    // Set to current day and hour, so strings like '14:00' becomes today at
+    // 14, not some other random date
+    wxDateTime dtDate = wxDateTime::Today();
+    wxDateTime dtTime = wxDateTime::Today();
+
+    const wxChar* pchTime;
+
+    // Try to parse the beginning of the string as a date
+    const wxChar* pchDate = dtDate.ParseDate(date);
+
+    // We got a date in the beginning, see if there is a time specified after the date
+    if ( pchDate )
+    {
+        // Skip spaces, as the ParseTime() function fails on spaces
+        while ( wxIsspace(*pchDate) )
+            pchDate++;
 
 
-    return (wxChar *)NULL;
+        pchTime = dtTime.ParseTime(pchDate);
+    }
+    else // no date in the beginning
+    {
+        // check and see if we have a time followed by a date
+        pchTime = dtTime.ParseTime(date);
+        if ( pchTime )
+        {
+            while ( wxIsspace(*pchTime) )
+                pchTime++;
+
+            pchDate = dtDate.ParseDate(pchTime);
+        }
+    }
+
+    // If we have a date specified, set our own data to the same date
+    if ( !pchDate || !pchTime )
+        return NULL;
+
+    Set(dtDate.GetDay(), dtDate.GetMonth(), dtDate.GetYear(),
+        dtTime.GetHour(), dtTime.GetMinute(), dtTime.GetSecond(),
+        dtTime.GetMillisecond());
+
+    // Return endpoint of scan
+    return pchDate > pchTime ? pchDate : pchTime;
 }
 
 const wxChar *wxDateTime::ParseDate(const wxChar *date)
 }
 
 const wxChar *wxDateTime::ParseDate(const wxChar *date)
@@ -3252,19 +3700,23 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
     {
         wxString date = wxGetTranslation(literalDates[n].str);
         size_t len = date.length();
     {
         wxString date = wxGetTranslation(literalDates[n].str);
         size_t len = date.length();
-        if ( wxStrlen(p) >= len && (wxString(p, len).CmpNoCase(date) == 0) )
+        if ( wxStrlen(p) >= len )
         {
         {
-            // nothing can follow this, so stop here
-            p += len;
-
-            int dayDiffFromToday = literalDates[n].dayDiffFromToday;
-            *this = Today();
-            if ( dayDiffFromToday )
+            wxString str(p, len);
+            if ( str.CmpNoCase(date) == 0 )
             {
             {
-                *this += wxDateSpan::Days(dayDiffFromToday);
-            }
+                // nothing can follow this, so stop here
+                p += len;
 
 
-            return p;
+                int dayDiffFromToday = literalDates[n].dayDiffFromToday;
+                *this = Today();
+                if ( dayDiffFromToday )
+                {
+                    *this += wxDateSpan::Days(dayDiffFromToday);
+                }
+
+                return p;
+            }
         }
     }
 
         }
     }
 
@@ -3274,10 +3726,10 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
     // have the ability to back track.
 
     // what do we have?
     // have the ability to back track.
 
     // what do we have?
-    bool haveDay = FALSE,       // the months day?
-         haveWDay = FALSE,      // the day of week?
-         haveMon = FALSE,       // the month?
-         haveYear = FALSE;      // the year?
+    bool haveDay = false,       // the months day?
+         haveWDay = false,      // the day of week?
+         haveMon = false,       // the month?
+         haveYear = false;      // the year?
 
     // and the value of the items we have (init them to get rid of warnings)
     WeekDay wday = Inv_WeekDay;
 
     // and the value of the items we have (init them to get rid of warnings)
     WeekDay wday = Inv_WeekDay;
@@ -3301,29 +3753,40 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
         {
             // guess what this number is
 
         {
             // guess what this number is
 
-            bool isDay = FALSE,
-                 isMonth = FALSE,
-                 isYear = FALSE;
+            bool isDay = false,
+                 isMonth = false,
+                 isYear = false;
 
             if ( !haveMon && val > 0 && val <= 12 )
             {
                 // assume it is month
 
             if ( !haveMon && val > 0 && val <= 12 )
             {
                 // assume it is month
-                isMonth = TRUE;
+                isMonth = true;
             }
             else // not the month
             {
             }
             else // not the month
             {
-                wxDateTime_t maxDays = haveMon
-                    ? GetNumOfDaysInMonth(haveYear ? year : Inv_Year, mon)
-                    : 31;
-
-                // can it be day?
-                if ( (val == 0) || (val > (unsigned long)maxDays) )  // cast to shut up compiler warning in BCC
+                if ( haveDay )
                 {
                 {
-                    isYear = TRUE;
+                    // this can only be the year
+                    isYear = true;
                 }
                 }
-                else
+                else // may be either day or year
                 {
                 {
-                    isDay = TRUE;
+                    wxDateTime_t max_days = (wxDateTime_t)(
+                        haveMon
+                        ? GetNumOfDaysInMonth(haveYear ? year : Inv_Year, mon)
+                        : 31
+                    );
+
+                    // can it be day?
+                    if ( (val == 0) || (val > (unsigned long)max_days) )
+                    {
+                        // no
+                        isYear = true;
+                    }
+                    else // yes, suppose it's the day
+                    {
+                        isDay = true;
+                    }
                 }
             }
 
                 }
             }
 
@@ -3332,7 +3795,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                 if ( haveYear )
                     break;
 
                 if ( haveYear )
                     break;
 
-                haveYear = TRUE;
+                haveYear = true;
 
                 year = (wxDateTime_t)val;
             }
 
                 year = (wxDateTime_t)val;
             }
@@ -3341,13 +3804,13 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                 if ( haveDay )
                     break;
 
                 if ( haveDay )
                     break;
 
-                haveDay = TRUE;
+                haveDay = true;
 
                 day = (wxDateTime_t)val;
             }
             else if ( isMonth )
             {
 
                 day = (wxDateTime_t)val;
             }
             else if ( isMonth )
             {
-                haveMon = TRUE;
+                haveMon = true;
 
                 mon = (Month)(val - 1);
             }
 
                 mon = (Month)(val - 1);
             }
@@ -3366,8 +3829,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                     {
                         // no need to check in month range as always < 12, but
                         // the days are counted from 1 unlike the months
                     {
                         // no need to check in month range as always < 12, but
                         // the days are counted from 1 unlike the months
-                        day = (wxDateTime_t)mon + 1;
-                        haveDay = TRUE;
+                        day = (wxDateTime_t)(mon + 1);
+                        haveDay = true;
                     }
                     else
                     {
                     }
                     else
                     {
@@ -3379,7 +3842,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
 
                 mon = mon2;
 
 
                 mon = mon2;
 
-                haveMon = TRUE;
+                haveMon = true;
             }
             else // not a valid month name
             {
             }
             else // not a valid month name
             {
@@ -3392,7 +3855,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                         break;
                     }
 
                         break;
                     }
 
-                    haveWDay = TRUE;
+                    haveWDay = true;
                 }
                 else // not a valid weekday name
                 {
                 }
                 else // not a valid weekday name
                 {
@@ -3447,7 +3910,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                         break;
                     }
 
                         break;
                     }
 
-                    haveDay = TRUE;
+                    haveDay = true;
 
                     day = (wxDateTime_t)(n + 1);
                 }
 
                     day = (wxDateTime_t)(n + 1);
                 }
@@ -3488,12 +3951,12 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                 // we're in the current year then
                 if ( (year > 0) && (year <= (int)GetNumOfDaysInMonth(Inv_Year, mon)) )
                 {
                 // we're in the current year then
                 if ( (year > 0) && (year <= (int)GetNumOfDaysInMonth(Inv_Year, mon)) )
                 {
-                    day = year;
+                    day = (wxDateTime_t)year;
 
 
-                    haveMon = TRUE;
-                    haveYear = FALSE;
+                    haveMon = true;
+                    haveYear = false;
                 }
                 }
-                //else: no, can't exchange, leave haveMon == FALSE
+                //else: no, can't exchange, leave haveMon == false
             }
         }
 
             }
         }
 
@@ -3637,10 +4100,25 @@ bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const
     return !wxDateTimeHolidayAuthority::IsHoliday(*this);
 }
 
     return !wxDateTimeHolidayAuthority::IsHoliday(*this);
 }
 
+// ============================================================================
+// wxDateSpan
+// ============================================================================
+
+wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds)
+{
+    wxDateSpan ds1(ds);
+    return ds1.Multiply(n);
+}
+
 // ============================================================================
 // wxTimeSpan
 // ============================================================================
 
 // ============================================================================
 // wxTimeSpan
 // ============================================================================
 
+wxTimeSpan WXDLLIMPEXP_BASE operator*(int n, const wxTimeSpan& ts)
+{
+    return wxTimeSpan(ts).Multiply(n);
+}
+
 // this enum is only used in wxTimeSpan::Format() below but we can't declare
 // it locally to the method as it provokes an internal compiler error in egcs
 // 2.91.60 when building with -O2
 // this enum is only used in wxTimeSpan::Format() below but we can't declare
 // it locally to the method as it provokes an internal compiler error in egcs
 // 2.91.60 when building with -O2
@@ -3672,7 +4150,7 @@ enum TimeSpanPart
 //  %l          milliseconds (000 - 999)
 wxString wxTimeSpan::Format(const wxChar *format) const
 {
 //  %l          milliseconds (000 - 999)
 wxString wxTimeSpan::Format(const wxChar *format) const
 {
-    wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") );
+    wxCHECK_MSG( format, wxEmptyString, _T("NULL format in wxTimeSpan::Format") );
 
     wxString str;
     str.Alloc(wxStrlen(format));
 
     wxString str;
     str.Alloc(wxStrlen(format));
@@ -3833,11 +4311,11 @@ bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
     {
         if ( ms_authorities[n]->DoIsHoliday(dt) )
         {
     {
         if ( ms_authorities[n]->DoIsHoliday(dt) )
         {
-            return TRUE;
+            return true;
         }
     }
 
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 /* static */
 }
 
 /* static */
@@ -3877,7 +4355,7 @@ void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
 
 wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
 {
 
 wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
 {
-    // nothing to do here
+    // required here for Darwin
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -3925,4 +4403,46 @@ size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
     return holidays.GetCount();
 }
 
     return holidays.GetCount();
 }
 
+// ============================================================================
+// other helper functions
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// iteration helpers: can be used to write a for loop over enum variable like
+// this:
+//  for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
+// ----------------------------------------------------------------------------
+
+WXDLLIMPEXP_BASE void wxNextMonth(wxDateTime::Month& m)
+{
+    wxASSERT_MSG( m < wxDateTime::Inv_Month, _T("invalid month") );
+
+    // no wrapping or the for loop above would never end!
+    m = (wxDateTime::Month)(m + 1);
+}
+
+WXDLLIMPEXP_BASE void wxPrevMonth(wxDateTime::Month& m)
+{
+    wxASSERT_MSG( m < wxDateTime::Inv_Month, _T("invalid month") );
+
+    m = m == wxDateTime::Jan ? wxDateTime::Inv_Month
+                             : (wxDateTime::Month)(m - 1);
+}
+
+WXDLLIMPEXP_BASE void wxNextWDay(wxDateTime::WeekDay& wd)
+{
+    wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, _T("invalid week day") );
+
+    // no wrapping or the for loop above would never end!
+    wd = (wxDateTime::WeekDay)(wd + 1);
+}
+
+WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd)
+{
+    wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, _T("invalid week day") );
+
+    wd = wd == wxDateTime::Sun ? wxDateTime::Inv_WeekDay
+                               : (wxDateTime::WeekDay)(wd - 1);
+}
+
 #endif // wxUSE_DATETIME
 #endif // wxUSE_DATETIME