wxTLW::SetLeft/RightMenu of smart phones documented.

[wxWidgets.git] / src / common / datetime.cpp

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 02ab38450cd3c37ac09b1d38d763f5ab63b7dea4..c8f8b2aea594b0d27ea827801f36b7f6596b510d 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -13,7 +13,7 @@
 //               so long as the above copyright and this permission statement
 //               are retained in all copies.
 //
 //               so long as the above copyright and this permission statement
 //               are retained in all copies.
 //

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 /*
 ///////////////////////////////////////////////////////////////////////////////
 
 /*


@@ -52,7 +52,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "datetime.h"
 #endif
 
     #pragma implementation "datetime.h"
 #endif
 


@@ -63,28 +63,48 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"

-    #include "wx/intl.h"

     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

+#include "wx/intl.h"

 #include "wx/thread.h"
 #include "wx/tokenzr.h"
 #include "wx/module.h"
 
 #include "wx/thread.h"
 #include "wx/tokenzr.h"
 #include "wx/module.h"
 

-#define wxDEFINE_TIME_CONSTANTS // before including datetime.h
-

 #include <ctype.h>
 
 #include "wx/datetime.h"
 #include <ctype.h>
 
 #include "wx/datetime.h"

-#include "wx/timer.h"           // for wxGetLocalTimeMillis()
+#include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
+
+const long wxDateTime::TIME_T_FACTOR = 1000l;
+
+#if wxUSE_EXTENDED_RTTI
+
+template<> void wxStringReadValue(const wxString &s , wxDateTime &data )
+{
+    data.ParseFormat(s,wxT("%Y-%m-%d %H:%M:%S")) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxDateTime &data )
+{
+    s = data.Format(wxT("%Y-%m-%d %H:%M:%S")) ;
+}
+
+wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringConverter<wxDateTime>)

 
 

+#endif
+
+//

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 

-#if defined(HAVE_STRPTIME) && defined(__LINUX__)
+#if defined(HAVE_STRPTIME) && defined(__GLIBC__) && \
+        ((__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0))

     // glibc 2.0.7 strptime() is broken - the following snippet causes it to
     // crash (instead of just failing):
     //
     // glibc 2.0.7 strptime() is broken - the following snippet causes it to
     // crash (instead of just failing):
     //


@@ -95,16 +115,37 @@
     #undef HAVE_STRPTIME
 #endif // broken strptime()
 
     #undef HAVE_STRPTIME
 #endif // broken strptime()
 

-#ifndef WX_TIMEZONE
+#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__)
         #define WX_TIMEZONE _timezone
     #elif defined(__MWERKS__)
         long wxmw_timezone = 28800;
     #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         #define WX_TIMEZONE _timezone
     #elif defined(__MWERKS__)
         long wxmw_timezone = 28800;

-        #define WX_TIMEZONE wxmw_timezone;
+        #define WX_TIMEZONE wxmw_timezone
+    #elif defined(__DJGPP__) || defined(__WINE__)
+        #include <sys/timeb.h>
+        #include <values.h>
+        static long wxGetTimeZone()
+        {
+            static long timezone = MAXLONG; // invalid timezone
+            if (timezone == MAXLONG)
+            {
+                struct timeb tb;
+                ftime(&tb);
+                timezone = tb.timezone;
+            }
+            return timezone;
+        }
+        #define WX_TIMEZONE wxGetTimeZone()
+    #elif defined(__DARWIN__)
+        #define WX_GMTOFF_IN_TM

     #else // unknown platform - try timezone
         #define WX_TIMEZONE timezone
     #endif
     #else // unknown platform - try timezone
         #define WX_TIMEZONE timezone
     #endif

-#endif // !WX_TIMEZONE
+#endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -130,13 +171,13 @@ public:
     {
         wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
 
     {
         wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
 

-        return TRUE;
+        return true;

     }
 
     virtual void OnExit()
     {
         wxDateTimeHolidayAuthority::ClearAllAuthorities();
     }
 
     virtual void OnExit()
     {
         wxDateTimeHolidayAuthority::ClearAllAuthorities();

-        wxDateTimeHolidayAuthority::ms_authorities.Clear();
+        wxDateTimeHolidayAuthority::ms_authorities.clear();

     }
 
 private:
     }
 
 private:


@@ -194,23 +235,10 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
 
 // in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
 // indicate an invalid wxDateTime object
 
 // in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
 // indicate an invalid wxDateTime object

-
-static const wxDateTime gs_dtDefault;
-
-const wxDateTime& wxDefaultDateTime = gs_dtDefault;
+const wxDateTime wxDefaultDateTime;

 
 wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
 
 
 wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
 

-// ----------------------------------------------------------------------------
-// private globals
-// ----------------------------------------------------------------------------
-
-// a critical section is needed to protect GetTimeZone() static
-// variable in MT case
-#if wxUSE_THREADS
-    static wxCriticalSection gs_critsectTimezone;
-#endif // wxUSE_THREADS
-

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -242,25 +270,36 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
     return daysInMonth[wxDateTime::IsLeapYear(year)][month];
 }
 
     return daysInMonth[wxDateTime::IsLeapYear(year)][month];
 }
 

-// ensure that the timezone variable is set by calling localtime
+// returns the time zone in the C sense, i.e. the difference UTC - local
+// (in seconds)

 static int GetTimeZone()
 {
 static int GetTimeZone()
 {

-    // set to TRUE when the timezone is set
-    static bool s_timezoneSet = FALSE;
-
-    wxCRIT_SECT_LOCKER(lock, gs_critsectTimezone);
+#ifdef WX_GMTOFF_IN_TM
+    // 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

     if ( !s_timezoneSet )
     {
         // just call localtime() instead of figuring out whether this system
         // supports tzset(), _tzset() or something else
     if ( !s_timezoneSet )
     {
         // just call localtime() instead of figuring out whether this system
         // supports tzset(), _tzset() or something else

-        time_t                 t = 0;
+        time_t t = 0;
+        struct tm *tm;

 
 

-        (void)localtime(&t);
-        s_timezoneSet = TRUE;
+        tm = localtime(&t);
+        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
+        // cases we have to negate it
+        gmtoffset = -tm->tm_gmtoff;

     }
 
     }
 

+    return (int)gmtoffset;
+#else // !WX_GMTOFF_IN_TM

     return (int)WX_TIMEZONE;
     return (int)WX_TIMEZONE;

+#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM

 }
 
 // return the integral part of the JDN for the midnight of the given date (to
 }
 
 // return the integral part of the JDN for the midnight of the given date (to


@@ -303,7 +342,7 @@ static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
             - JDN_OFFSET;
 }
 
             - JDN_OFFSET;
 }
 

-// this function is a wrapper around strftime(3)
+// this function is a wrapper around strftime(3) adding error checking

 static wxString CallStrftime(const wxChar *format, const tm* tm)
 {
     wxChar buf[4096];
 static wxString CallStrftime(const wxChar *format, const tm* tm)
 {
     wxChar buf[4096];


@@ -316,6 +355,41 @@ static wxString CallStrftime(const wxChar *format, const tm* tm)
     return wxString(buf);
 }
 
     return wxString(buf);
 }
 

+#ifdef HAVE_STRPTIME
+
+// glibc2 doesn't define this in the headers unless _XOPEN_SOURCE is defined
+// which, unfortunately, wreaks havoc elsewhere
+#if defined(__GLIBC__) && (__GLIBC__ == 2)
+    extern "C" char *strptime(const char *, const char *, struct tm *);
+#endif
+
+// Unicode-friendly strptime() wrapper
+static const wxChar *
+CallStrptime(const wxChar *input, const char *fmt, tm *tm)
+{
+    // the problem here is that strptime() returns pointer into the string we
+    // passed to it while we're really interested in the pointer into the
+    // original, Unicode, string so we try to transform the pointer back
+#if wxUSE_UNICODE
+    wxCharBuffer inputMB(wxConvertWX2MB(input));
+#else // ASCII
+    const char * const inputMB = input;
+#endif // Unicode/Ascii
+
+    const char *result = strptime(inputMB, fmt, tm);
+    if ( !result )
+        return NULL;
+
+#if wxUSE_UNICODE
+    // FIXME: this is wrong in presence of surrogates &c
+    return input + (result - inputMB.data());
+#else // ASCII
+    return result;
+#endif // Unicode/Ascii
+}
+
+#endif // HAVE_STRPTIME
+

 // if year and/or month have invalid values, replace them with the current ones
 static void ReplaceDefaultYearMonthWithCurrent(int *year,
                                                wxDateTime::Month *month)
 // if year and/or month have invalid values, replace them with the current ones
 static void ReplaceDefaultYearMonthWithCurrent(int *year,
                                                wxDateTime::Month *month)


@@ -426,7 +500,7 @@ static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *number)
             break;
     }
 
             break;
     }
 

-    return !!s && s.ToULong(number);
+    return !s.IsEmpty() && s.ToULong(number);

 }
 
 // scans all alphabetic characters and returns the resulting string
 }
 
 // scans all alphabetic characters and returns the resulting string


@@ -617,7 +691,7 @@ bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal)
     {
         wxFAIL_MSG(_T("unknown calendar"));
 
     {
         wxFAIL_MSG(_T("unknown calendar"));
 

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -743,10 +817,12 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
 {
     wxCHECK_MSG( wday != Inv_WeekDay, _T(""), _T("invalid weekday") );
 
 {
     wxCHECK_MSG( wday != Inv_WeekDay, _T(""), _T("invalid weekday") );
 

-    // take some arbitrary Sunday
+    // 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;
 


@@ -765,14 +841,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, _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, _T("%p"), &tm) > 0)
+            *pm = wxString(buffer);
+        else
+            *pm = wxString();

     }
 }
 
     }
 }
 


@@ -911,7 +1002,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 )
     {


@@ -1012,7 +1103,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 )
     {


@@ -1198,6 +1289,17 @@ wxDateTime& wxDateTime::Set(double jdn)
 
     jdn *= MILLISECONDS_PER_DAY;
 
 
     jdn *= MILLISECONDS_PER_DAY;
 

+    // 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;
+    }
+
+    jdn += tzDiff*1000; // tzDiff is in seconds
+

     m_time.Assign(jdn);
 
     return *this;
     m_time.Assign(jdn);
 
     return *this;


@@ -1220,6 +1322,83 @@ wxDateTime& wxDateTime::ResetTime()
     return *this;
 }
 
     return *this;
 }
 

+// ----------------------------------------------------------------------------
+// DOS Date and Time Format functions
+// ----------------------------------------------------------------------------
+// the dos date and time value is an unsigned 32 bit value in the format:
+// YYYYYYYMMMMDDDDDhhhhhmmmmmmsssss
+//
+// Y = year offset from 1980 (0-127)
+// M = month (1-12)
+// D = day of month (1-31)
+// h = hour (0-23)
+// m = minute (0-59)
+// s = bisecond (0-29) each bisecond indicates two seconds
+// ----------------------------------------------------------------------------
+
+wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
+{
+    struct tm tm;
+    InitTm(tm);
+
+    long year = ddt & 0xFE000000;
+    year >>= 25;
+    year += 80;
+    tm.tm_year = year;
+
+    long month = ddt & 0x1E00000;
+    month >>= 21;
+    month -= 1;
+    tm.tm_mon = month;
+
+    long day = ddt & 0x1F0000;
+    day >>= 16;
+    tm.tm_mday = day;
+
+    long hour = ddt & 0xF800;
+    hour >>= 11;
+    tm.tm_hour = hour;
+
+    long minute = ddt & 0x7E0;
+    minute >>= 5;
+    tm.tm_min = minute;
+
+    long second = ddt & 0x1F;
+    tm.tm_sec = second * 2;
+
+    return Set(mktime(&tm));
+}
+
+unsigned long wxDateTime::GetAsDOS() const
+{
+    unsigned long ddt;
+    time_t ticks = GetTicks();
+    struct tm *tm = localtime(&ticks);
+
+    long year = tm->tm_year;
+    year -= 80;
+    year <<= 25;
+
+    long month = tm->tm_mon;
+    month += 1;
+    month <<= 21;
+
+    long day = tm->tm_mday;
+    day <<= 16;
+
+    long hour = tm->tm_hour;
+    hour <<= 11;
+
+    long minute = tm->tm_min;
+    minute <<= 5;
+
+    long second = tm->tm_sec;
+    second /= 2;
+
+    ddt = year | month | day | hour | minute | second;
+    return ddt;
+}
+

 // ----------------------------------------------------------------------------
 // time_t <-> broken down time conversions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // time_t <-> broken down time conversions
 // ----------------------------------------------------------------------------


@@ -1467,21 +1646,63 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
 // Weekday and monthday stuff
 // ----------------------------------------------------------------------------
 
 // Weekday and monthday stuff
 // ----------------------------------------------------------------------------
 

-bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek, WeekDay weekday)
+// convert Sun, Mon, ..., Sat into 6, 0, ..., 5
+static inline int ConvertWeekDayToMondayBase(int wd)

 {
 {

-    int year = GetYear();
+    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") );
+
+    // 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) += wxDateSpan::Weeks(numWeek);
+    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,


@@ -1496,17 +1717,34 @@ wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
     return Set(GetNumOfDaysInMonth(year, month), month, year);
 }
 
     return Set(GetNumOfDaysInMonth(year, month), month, year);
 }
 

-wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday)
+wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)

 {
     wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
 
 {
     wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
 

-    WeekDay wdayThis = GetWeekDay();
+    int wdayThis = GetWeekDay();

     if ( weekday == wdayThis )
     {
         // nothing to do
         return *this;
     }
     if ( weekday == wdayThis )
     {
         // nothing to do
         return *this;
     }

-    else if ( weekday < wdayThis )
+
+    if ( flags == Default_First )
+    {
+        flags = GetCountry() == USA ? Sunday_First : Monday_First;
+    }
+
+    // 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 ( wdayThis == Sun )
+            wdayThis += 7;
+    }
+    //else: Sunday_First, nothing to do
+
+    // go forward or back in time to the day we want
+    if ( weekday < wdayThis )

     {
         return Subtract(wxDateSpan::Days(wdayThis - weekday));
     }
     {
         return Subtract(wxDateSpan::Days(wdayThis - weekday));
     }


@@ -1569,9 +1807,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


@@ -1623,49 +1861,84 @@ 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 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 week;


@@ -1699,7 +1972,7 @@ 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(yday - gs_cumulatedDays[isLeap][mon], mon, year);
 


@@ -1716,8 +1989,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);
 


@@ -1874,6 +2147,10 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                 fmt = _T("%03d");
                 break;
 
                 fmt = _T("%03d");
                 break;
 

+            case _T('w'):               // week day as number has only one
+                fmt = _T("%d");
+                break;
+

             default:
                 // it's either another valid format specifier in which case
                 // the format is "%02d" (for all the rest) or we have the
             default:
                 // it's either another valid format specifier in which case
                 // the format is "%02d" (for all the rest) or we have the


@@ -1882,17 +2159,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;


@@ -2123,7 +2400,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                         fmt.Prepend(_T('%'));
                         fmt.Append(_T('d'));
 
                         fmt.Prepend(_T('%'));
                         fmt.Append(_T('d'));
 

-                        restart = TRUE;
+                        restart = true;

 
                         break;
                     }
 
                         break;
                     }


@@ -2456,17 +2733,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,


@@ -2511,12 +2788,36 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
 
         // parse the optional width
         size_t width = 0;
 
         // parse the optional width
         size_t width = 0;

-        while ( isdigit(*++fmt) )
+        while ( wxIsdigit(*++fmt) )

         {
             width *= 10;
             width += *fmt - _T('0');
         }
 
         {
             width *= 10;
             width += *fmt - _T('0');
         }
 

+        // the default widths for the various fields
+        if ( !width )
+        {
+            switch ( *fmt )
+            {
+                case _T('Y'):               // year has 4 digits
+                    width = 4;
+                    break;
+
+                case _T('j'):               // day of year has 3 digits
+                case _T('l'):               // milliseconds have 3 digits
+                    width = 3;
+                    break;
+
+                case _T('w'):               // week day as number has only one
+                    width = 1;
+                    break;
+
+                default:
+                    // default for all other fields
+                    width = 2;
+            }
+        }
+

         // then the format itself
         switch ( *fmt )
         {
         // then the format itself
         switch ( *fmt )
         {


@@ -2531,7 +2832,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


@@ -2545,7 +2846,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


@@ -2576,7 +2877,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;


@@ -2600,7 +2901,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;
 


@@ -2611,7 +2912,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;
 


@@ -2622,8 +2923,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;
 


@@ -2634,7 +2935,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;
 


@@ -2645,7 +2946,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;
 


@@ -2656,7 +2957,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;
 


@@ -2665,9 +2966,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.IsEmpty() && pm.IsEmpty())
+                        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 )
                     {


@@ -2687,7 +2990,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;


@@ -2706,7 +3009,7 @@ 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;
 
                     Tm tm = dt.GetTm();
                     hour = tm.hour;


@@ -2720,7 +3023,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;
 


@@ -2734,7 +3037,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;


@@ -2750,23 +3053,24 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     return (wxChar *)NULL;
                 }
 
                     return (wxChar *)NULL;
                 }
 

-                haveWDay = TRUE;
+                haveWDay = true;

                 wday = (WeekDay)num;
                 break;
 
             case _T('x'):       // locale default date representation
 #ifdef HAVE_STRPTIME
                 wday = (WeekDay)num;
                 break;
 
             case _T('x'):       // locale default date representation
 #ifdef HAVE_STRPTIME

-                // try using strptime() - it may fail even if the input is
+                // try using strptime() -- it may fail even if the input is

                 // correct but the date is out of range, so we will fall back
                 // correct but the date is out of range, so we will fall back

-                // to our generic code anyhow (FIXME !Unicode friendly)
+                // to our generic code anyhow

                 {
                     struct tm tm;
                 {
                     struct tm tm;

-                    const wxChar *result = strptime(input, "%x", &tm);
+
+                    const wxChar *result = CallStrptime(input, "%x", &tm);

                     if ( result )
                     {
                         input = result;
 
                     if ( 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;


@@ -2810,7 +3114,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;


@@ -2826,13 +3130,13 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 {
                     // use strptime() to do it for us (FIXME !Unicode friendly)
                     struct tm tm;
                 {
                     // use strptime() to do it for us (FIXME !Unicode friendly)
                     struct tm tm;

-                    input = strptime(input, "%X", &tm);
+                    input = CallStrptime(input, "%X", &tm);

                     if ( !input )
                     {
                         return (wxChar *)NULL;
                     }
 
                     if ( !input )
                     {
                         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;


@@ -2860,7 +3164,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;


@@ -2879,7 +3183,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


@@ -2893,7 +3197,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;
 


@@ -3001,6 +3305,14 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
 
     Set(tm);
 
 
     Set(tm);
 

+    // finally check that the week day is consistent -- if we had it
+    if ( haveWDay && GetWeekDay() != wday )
+    {
+        wxLogDebug(_T("inconsistsnet week day in wxDateTime::ParseFormat()"));
+
+        return NULL;
+    }
+

     return input;
 }
 
     return input;
 }
 


@@ -3008,11 +3320,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++;
+
+        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);
+        }
+    }

 
 

-    return (wxChar *)NULL;
+    // 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)


@@ -3065,10 +3414,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;


@@ -3078,7 +3427,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
 
     // tokenize the string
     size_t nPosCur = 0;
 
     // tokenize the string
     size_t nPosCur = 0;

-    static const wxChar *dateDelimiters = _T(".,/-\t\n ");
+    static const wxChar *dateDelimiters = _T(".,/-\t\r\n ");

     wxStringTokenizer tok(p, dateDelimiters);
     while ( tok.HasMoreTokens() )
     {
     wxStringTokenizer tok(p, dateDelimiters);
     while ( tok.HasMoreTokens() )
     {


@@ -3092,29 +3441,38 @@ 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 maxDays = haveMon
+                        ? GetNumOfDaysInMonth(haveYear ? year : Inv_Year, mon)
+                        : 31;
+
+                    // can it be day?
+                    if ( (val == 0) || (val > (unsigned long)maxDays) )
+                    {
+                        // no
+                        isYear = true;
+                    }
+                    else // yes, suppose it's the day
+                    {
+                        isDay = true;
+                    }

                 }
             }
 
                 }
             }
 


@@ -3123,7 +3481,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;
             }


@@ -3132,13 +3490,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);
             }


@@ -3158,7 +3516,7 @@ 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
                         day = (wxDateTime_t)mon + 1;
                         // 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;
+                        haveDay = true;

                     }
                     else
                     {
                     }
                     else
                     {


@@ -3170,7 +3528,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
             {


@@ -3183,7 +3541,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
                 {


@@ -3238,7 +3596,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                         break;
                     }
 
                         break;
                     }
 

-                    haveDay = TRUE;
+                    haveDay = true;

 
                     day = (wxDateTime_t)(n + 1);
                 }
 
                     day = (wxDateTime_t)(n + 1);
                 }


@@ -3277,15 +3635,14 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                 mon = (wxDateTime::Month)(day - 1);
 
                 // we're in the current year then
                 mon = (wxDateTime::Month)(day - 1);
 
                 // we're in the current year then

-                if ( (year > 0) &&
-                        (unsigned)year <= GetNumOfDaysInMonth(Inv_Year, mon) )
+                if ( (year > 0) && (year <= (int)GetNumOfDaysInMonth(Inv_Year, mon)) )

                 {
                     day = year;
 
                 {
                     day = 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

             }
         }
 
             }
         }
 


@@ -3365,7 +3722,8 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
         size_t len = timeString.length();
         if ( timeString.CmpNoCase(wxString(time, len)) == 0 )
         {
         size_t len = timeString.length();
         if ( timeString.CmpNoCase(wxString(time, len)) == 0 )
         {

-            Set(stdTimes[n].hour, 0, 0);
+            // casts required by DigitalMars
+            Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));

 
             return time + len;
         }
 
             return time + len;
         }


@@ -3619,16 +3977,16 @@ wxHolidayAuthoritiesArray wxDateTimeHolidayAuthority::ms_authorities;
 /* static */
 bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
 {
 /* static */
 bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
 {

-    size_t count = ms_authorities.GetCount();
+    size_t count = ms_authorities.size();

     for ( size_t n = 0; n < count; n++ )
     {
         if ( ms_authorities[n]->DoIsHoliday(dt) )
         {
     for ( size_t n = 0; n < count; n++ )
     {
         if ( ms_authorities[n]->DoIsHoliday(dt) )
         {

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 /* static */
 }
 
 /* static */


@@ -3639,9 +3997,9 @@ wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart,
 {
     wxDateTimeArray hol;
 
 {
     wxDateTimeArray hol;
 

-    holidays.Empty();
+    holidays.Clear();

 
 

-    size_t count = ms_authorities.GetCount();
+    size_t count = ms_authorities.size();

     for ( size_t nAuth = 0; nAuth < count; nAuth++ )
     {
         ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
     for ( size_t nAuth = 0; nAuth < count; nAuth++ )
     {
         ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);


@@ -3651,7 +4009,7 @@ wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart,
 
     holidays.Sort(wxDateTimeCompareFunc);
 
 
     holidays.Sort(wxDateTimeCompareFunc);
 

-    return holidays.GetCount();
+    return holidays.size();

 }
 
 /* static */
 }
 
 /* static */


@@ -3663,7 +4021,12 @@ void wxDateTimeHolidayAuthority::ClearAllAuthorities()
 /* static */
 void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
 {
 /* static */
 void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
 {

-    ms_authorities.Add(auth);
+    ms_authorities.push_back(auth);
+}
+
+wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
+{
+    // nothing to do here

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -3711,4 +4074,4 @@ size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
     return holidays.GetCount();
 }
 
     return holidays.GetCount();
 }
 

-
+#endif // wxUSE_DATETIME