make sure gs_captureWindow is always set to NULL in DoReleaseMouse

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 0c392aa5abbe3e4428db8990aa1cdb4719e14f54..7dc31201942b12699377b48881284bbecb86462c 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -63,18 +63,24 @@
     #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/thread.h"
 #include "wx/tokenzr.h"

+#include "wx/module.h"

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

+#include <ctype.h>
+

 #include "wx/datetime.h"
 #include "wx/datetime.h"

+#include "wx/timer.h"           // for wxGetLocalTimeMillis()

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


@@ -94,11 +100,68 @@
 #ifndef WX_TIMEZONE
     #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         #define WX_TIMEZONE _timezone
 #ifndef WX_TIMEZONE
     #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         #define WX_TIMEZONE _timezone

+    #elif defined(__MWERKS__)
+        long wxmw_timezone = 28800;
+        #define WX_TIMEZONE wxmw_timezone
+    #elif defined(__DJGPP__)
+        #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()

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

+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// debugging helper: just a convenient replacement of wxCHECK()
+#define wxDATETIME_CHECK(expr, msg)     \
+        if ( !(expr) )                  \
+        {                               \
+            wxFAIL_MSG(msg);            \
+            *this = wxInvalidDateTime;  \
+            return *this;               \
+        }
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxDateTimeHolidaysModule : public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
+
+        return TRUE;
+    }
+
+    virtual void OnExit()
+    {
+        wxDateTimeHolidayAuthority::ClearAllAuthorities();
+        wxDateTimeHolidayAuthority::ms_authorities.Clear();
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxDateTimeHolidaysModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxDateTimeHolidaysModule, wxModule)
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -106,10 +169,16 @@
 // some trivial ones
 static const int MONTHS_IN_YEAR = 12;
 
 // some trivial ones
 static const int MONTHS_IN_YEAR = 12;
 

-static const int SECONDS_IN_MINUTE = 60;
+static const int SEC_PER_MIN = 60;
+
+static const int MIN_PER_HOUR = 60;
+
+static const int HOURS_PER_DAY = 24;

 
 static const long SECONDS_PER_DAY = 86400l;
 
 
 static const long SECONDS_PER_DAY = 86400l;
 

+static const int DAYS_PER_WEEK = 7;
+

 static const long MILLISECONDS_PER_DAY = 86400000l;
 
 // this is the integral part of JDN of the midnight of Jan 1, 1970
 static const long MILLISECONDS_PER_DAY = 86400000l;
 
 // this is the integral part of JDN of the midnight of Jan 1, 1970


@@ -137,19 +206,44 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// globals
+// global data
+// ----------------------------------------------------------------------------
+
+// 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;
+
+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
 // ----------------------------------------------------------------------------
 
 // a critical section is needed to protect GetTimeZone() static
 // variable in MT case
 #if wxUSE_THREADS

-    wxCriticalSection gs_critsectTimezone;
+    static wxCriticalSection gs_critsectTimezone;

 #endif // wxUSE_THREADS
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 #endif // wxUSE_THREADS
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

+// debugger helper: shows what the date really is
+#ifdef __WXDEBUG__
+extern const wxChar *wxDumpDate(const wxDateTime* dt)
+{
+    static wxChar buf[128];
+
+    wxStrcpy(buf, dt->Format(_T("%Y-%m-%d (%a) %H:%M:%S")));
+
+    return buf;
+}
+#endif // Debug
+

 // get the number of days in the given month of the given year
 static inline
 wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
 // get the number of days in the given month of the given year
 static inline
 wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)


@@ -177,9 +271,9 @@ static int GetTimeZone()
     {
         // just call localtime() instead of figuring out whether this system
         // supports tzset(), _tzset() or something else
     {
         // just call localtime() instead of figuring out whether this system
         // supports tzset(), _tzset() or something else

-        time_t t;
-        (void)localtime(&t);
+        time_t                 t = 0;

 
 

+        (void)localtime(&t);

         s_timezoneSet = TRUE;
     }
 
         s_timezoneSet = TRUE;
     }
 


@@ -336,13 +430,17 @@ static wxDateTime::WeekDay GetWeekDayFromName(const wxString& name, int flags)
     return wd;
 }
 
     return wd;
 }
 

-// scans all digits and returns the resulting number
-static bool GetNumericToken(const wxChar*& p, unsigned long *number)
+// scans all digits (but no more than len) and returns the resulting number
+static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *number)

 {
 {

+    size_t n = 1;

     wxString s;
     while ( wxIsdigit(*p) )
     {
         s += *p++;
     wxString s;
     while ( wxIsdigit(*p) )
     {
         s += *p++;

+
+        if ( len && ++n > len )
+            break;

     }
 
     return !!s && s.ToULong(number);
     }
 
     return !!s && s.ToULong(number);


@@ -364,13 +462,6 @@ static wxString GetAlphaToken(const wxChar*& p)
 // implementation of wxDateTime
 // ============================================================================
 
 // implementation of wxDateTime
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// static data
-// ----------------------------------------------------------------------------
-
-wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
-wxDateTime wxDateTime::ms_InvDateTime;
-

 // ----------------------------------------------------------------------------
 // struct Tm
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // struct Tm
 // ----------------------------------------------------------------------------


@@ -424,7 +515,7 @@ void wxDateTime::Tm::AddMonths(int monDiff)
         monDiff += MONTHS_IN_YEAR;
     }
 
         monDiff += MONTHS_IN_YEAR;
     }
 

-    while ( monDiff + mon > MONTHS_IN_YEAR )
+    while ( monDiff + mon >= MONTHS_IN_YEAR )

     {
         year++;
 
     {
         year++;
 


@@ -434,19 +525,22 @@ void wxDateTime::Tm::AddMonths(int monDiff)
     mon = (wxDateTime::Month)(mon + monDiff);
 
     wxASSERT_MSG( mon >= 0 && mon < MONTHS_IN_YEAR, _T("logic error") );
     mon = (wxDateTime::Month)(mon + monDiff);
 
     wxASSERT_MSG( mon >= 0 && mon < MONTHS_IN_YEAR, _T("logic error") );

+
+    // NB: we don't check here that the resulting date is valid, this function
+    //     is private and the caller must check it if needed

 }
 
 void wxDateTime::Tm::AddDays(int dayDiff)
 {
     // normalize the days field
 }
 
 void wxDateTime::Tm::AddDays(int dayDiff)
 {
     // normalize the days field

-    mday += dayDiff;
-    while ( mday < 1 )
+    while ( dayDiff + mday < 1 )

     {
         AddMonths(-1);
 
     {
         AddMonths(-1);
 

-        mday += GetNumOfDaysInMonth(year, mon);
+        dayDiff += GetNumOfDaysInMonth(year, mon);

     }
 
     }
 

+    mday += dayDiff;

     while ( mday > GetNumOfDaysInMonth(year, mon) )
     {
         mday -= GetNumOfDaysInMonth(year, mon);
     while ( mday > GetNumOfDaysInMonth(year, mon) )
     {
         mday -= GetNumOfDaysInMonth(year, mon);


@@ -817,7 +911,7 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country)
 
     if ( !IsDSTApplicable(year, country) )
     {
 
     if ( !IsDSTApplicable(year, country) )
     {

-        return ms_InvDateTime;
+        return wxInvalidDateTime;

     }
 
     wxDateTime dt;
     }
 
     wxDateTime dt;


@@ -918,7 +1012,7 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
 
     if ( !IsDSTApplicable(year, country) )
     {
 
     if ( !IsDSTApplicable(year, country) )
     {

-        return ms_InvDateTime;
+        return wxInvalidDateTime;

     }
 
     wxDateTime dt;
     }
 
     wxDateTime dt;


@@ -982,11 +1076,15 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
 // constructors and assignment operators
 // ----------------------------------------------------------------------------
 
 // constructors and assignment operators
 // ----------------------------------------------------------------------------
 

+// return the current time with ms precision
+/* static */ wxDateTime wxDateTime::UNow()
+{
+    return wxDateTime(wxGetLocalTimeMillis());
+}
+

 // the values in the tm structure contain the local time
 wxDateTime& wxDateTime::Set(const struct tm& tm)
 {
 // the values in the tm structure contain the local time
 wxDateTime& wxDateTime::Set(const struct tm& tm)
 {

-    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-

     struct tm tm2(tm);
     time_t timet = mktime(&tm2);
 
     struct tm tm2(tm);
     time_t timet = mktime(&tm2);
 


@@ -1010,7 +1108,9 @@ wxDateTime& wxDateTime::Set(const struct tm& tm)
 
         wxFAIL_MSG( _T("mktime() failed") );
 
 
         wxFAIL_MSG( _T("mktime() failed") );
 

-        return ms_InvDateTime;
+        *this = wxInvalidDateTime;
+
+        return *this;

     }
     else
     {
     }
     else
     {


@@ -1023,19 +1123,18 @@ wxDateTime& wxDateTime::Set(wxDateTime_t hour,
                             wxDateTime_t second,
                             wxDateTime_t millisec)
 {
                             wxDateTime_t second,
                             wxDateTime_t millisec)
 {

-    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-

     // we allow seconds to be 61 to account for the leap seconds, even if we
     // don't use them really
     // we allow seconds to be 61 to account for the leap seconds, even if we
     // don't use them really

-    wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000,
-                 ms_InvDateTime,
-                 _T("Invalid time in wxDateTime::Set()") );
+    wxDATETIME_CHECK( hour < 24 &&
+                      second < 62 &&
+                      minute < 60 &&
+                      millisec < 1000,
+                      _T("Invalid time in wxDateTime::Set()") );

 
     // get the current date from system
 
     // get the current date from system

-    time_t timet = GetTimeNow();
-    struct tm *tm = localtime(&timet);
+    struct tm *tm = GetTmNow();

 
 

-    wxCHECK_MSG( tm, ms_InvDateTime, _T("localtime() failed") );
+    wxDATETIME_CHECK( tm, _T("localtime() failed") );

 
     // adjust the time
     tm->tm_hour = hour;
 
     // adjust the time
     tm->tm_hour = hour;


@@ -1056,17 +1155,16 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
                             wxDateTime_t second,
                             wxDateTime_t millisec)
 {
                             wxDateTime_t second,
                             wxDateTime_t millisec)
 {

-    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-
-    wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000,
-                 ms_InvDateTime,
-                 _T("Invalid time in wxDateTime::Set()") );
+    wxDATETIME_CHECK( hour < 24 &&
+                      second < 62 &&
+                      minute < 60 &&
+                      millisec < 1000,
+                      _T("Invalid time in wxDateTime::Set()") );

 
     ReplaceDefaultYearMonthWithCurrent(&year, &month);
 
 
     ReplaceDefaultYearMonthWithCurrent(&year, &month);
 

-    wxCHECK_MSG( (0 < day) && (day <= GetNumberOfDays(month, year)),
-                 ms_InvDateTime,
-                 _T("Invalid date in wxDateTime::Set()") );
+    wxDATETIME_CHECK( (0 < day) && (day <= GetNumberOfDays(month, year)),
+                      _T("Invalid date in wxDateTime::Set()") );

 
     // the range of time_t type (inclusive)
     static const int yearMinInRange = 1970;
 
     // the range of time_t type (inclusive)
     static const int yearMinInRange = 1970;


@@ -1122,15 +1220,29 @@ wxDateTime& wxDateTime::Set(double jdn)
     return *this;
 }
 
     return *this;
 }
 

+wxDateTime& wxDateTime::ResetTime()
+{
+    Tm tm = GetTm();
+
+    if ( tm.hour || tm.min || tm.sec || tm.msec )
+    {
+        tm.msec =
+        tm.sec =
+        tm.min =
+        tm.hour = 0;
+
+        Set(tm);
+    }
+
+    return *this;
+}
+

 // ----------------------------------------------------------------------------
 // time_t <-> broken down time conversions
 // ----------------------------------------------------------------------------
 
 wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
 {
 // ----------------------------------------------------------------------------
 // time_t <-> broken down time conversions
 // ----------------------------------------------------------------------------
 
 wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
 {

-#ifdef __VMS__
-   int time2;
-#endif

     wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
 
     time_t time = GetTicks();
     wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
 
     time_t time = GetTicks();


@@ -1144,16 +1256,16 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
             tm = localtime(&time);
 
             // should never happen
             tm = localtime(&time);
 
             // should never happen

-            wxCHECK_MSG( tm, Tm(), _T("gmtime() failed") );
+            wxCHECK_MSG( tm, Tm(), _T("localtime() failed") );

         }
         else
         {
         }
         else
         {

-            time += tz.GetOffset();
-#ifdef __VMS__ /* time is unsigned so VMS gives a warning on the original */
-          time2 = (int) time;
-          if ( time2 >= 0 )
+            time += (time_t)tz.GetOffset();
+#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
+            int time2 = (int) time;
+            if ( time2 >= 0 )

 #else
 #else

-          if ( time >= 0 )
+            if ( time >= 0 )

 #endif
             {
                 tm = gmtime(&time);
 #endif
             {
                 tm = gmtime(&time);


@@ -1169,7 +1281,11 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
 
         if ( tm )
         {
 
         if ( tm )
         {

-            return Tm(*tm, tz);
+            // adjust the milliseconds
+            Tm tm2(*tm, tz);
+            long timeOnly = (m_time % MILLISECONDS_PER_DAY).ToLong();
+            tm2.msec = (wxDateTime_t)(timeOnly % 1000);
+            return tm2;

         }
         //else: use generic code below
     }
         }
         //else: use generic code below
     }


@@ -1201,18 +1317,18 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
     wxASSERT_MSG( jdn > -2, _T("JDN out of range") );
 
     // calculate the century
     wxASSERT_MSG( jdn > -2, _T("JDN out of range") );
 
     // calculate the century

-    int temp = (jdn + JDN_OFFSET) * 4 - 1;
-    int century = temp / DAYS_PER_400_YEARS;
+    long temp = (jdn + JDN_OFFSET) * 4 - 1;
+    long century = temp / DAYS_PER_400_YEARS;

 
     // then the year and day of year (1 <= dayOfYear <= 366)
     temp = ((temp % DAYS_PER_400_YEARS) / 4) * 4 + 3;
 
     // then the year and day of year (1 <= dayOfYear <= 366)
     temp = ((temp % DAYS_PER_400_YEARS) / 4) * 4 + 3;

-    int year = (century * 100) + (temp / DAYS_PER_4_YEARS);
-    int dayOfYear = (temp % DAYS_PER_4_YEARS) / 4 + 1;
+    long year = (century * 100) + (temp / DAYS_PER_4_YEARS);
+    long dayOfYear = (temp % DAYS_PER_4_YEARS) / 4 + 1;

 
     // and finally the month and day of the month
     temp = dayOfYear * 5 - 3;
 
     // and finally the month and day of the month
     temp = dayOfYear * 5 - 3;

-    int month = temp / DAYS_PER_5_MONTHS;
-    int day = (temp % DAYS_PER_5_MONTHS) / 5 + 1;
+    long month = temp / DAYS_PER_5_MONTHS;
+    long day = (temp % DAYS_PER_5_MONTHS) / 5 + 1;

 
     // month is counted from March - convert to normal
     if ( month < 10 )
 
     // month is counted from March - convert to normal
     if ( month < 10 )


@@ -1231,26 +1347,24 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
     // check that the algorithm gave us something reasonable
     wxASSERT_MSG( (0 < month) && (month <= 12), _T("invalid month") );
     wxASSERT_MSG( (1 <= day) && (day < 32), _T("invalid day") );
     // check that the algorithm gave us something reasonable
     wxASSERT_MSG( (0 < month) && (month <= 12), _T("invalid month") );
     wxASSERT_MSG( (1 <= day) && (day < 32), _T("invalid day") );

-    wxASSERT_MSG( (INT_MIN <= year) && (year <= INT_MAX),
-                  _T("year range overflow") );

 
     // construct Tm from these values
     Tm tm;
     tm.year = (int)year;
     tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0
     tm.mday = (wxDateTime_t)day;
 
     // construct Tm from these values
     Tm tm;
     tm.year = (int)year;
     tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0
     tm.mday = (wxDateTime_t)day;

-    tm.msec = timeOnly % 1000;
+    tm.msec = (wxDateTime_t)(timeOnly % 1000);

     timeOnly -= tm.msec;
     timeOnly /= 1000;               // now we have time in seconds
 
     timeOnly -= tm.msec;
     timeOnly /= 1000;               // now we have time in seconds
 

-    tm.sec = timeOnly % 60;
+    tm.sec = (wxDateTime_t)(timeOnly % 60);

     timeOnly -= tm.sec;
     timeOnly /= 60;                 // now we have time in minutes
 
     timeOnly -= tm.sec;
     timeOnly /= 60;                 // now we have time in minutes
 

-    tm.min = timeOnly % 60;
+    tm.min = (wxDateTime_t)(timeOnly % 60);

     timeOnly -= tm.min;
 
     timeOnly -= tm.min;
 

-    tm.hour = timeOnly / 60;
+    tm.hour = (wxDateTime_t)(timeOnly / 60);

 
     return tm;
 }
 
     return tm;
 }


@@ -1342,10 +1456,27 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
 
     tm.year += diff.GetYears();
     tm.AddMonths(diff.GetMonths());
 
     tm.year += diff.GetYears();
     tm.AddMonths(diff.GetMonths());

+
+    // check that the resulting date is valid
+    if ( tm.mday > GetNumOfDaysInMonth(tm.year, tm.mon) )
+    {
+        // We suppose that when adding one month to Jan 31 we want to get Feb
+        // 28 (or 29), i.e. adding a month to the last day of the month should
+        // give the last day of the next month which is quite logical.
+        //
+        // Unfortunately, there is no logic way to understand what should
+        // Jan 30 + 1 month be - Feb 28 too or Feb 27 (assuming non leap year)?
+        // We make it Feb 28 (last day too), but it is highly questionable.
+        tm.mday = GetNumOfDaysInMonth(tm.year, tm.mon);
+    }
+

     tm.AddDays(diff.GetTotalDays());
 
     Set(tm);
 
     tm.AddDays(diff.GetTotalDays());
 
     Set(tm);
 

+    wxASSERT_MSG( IsSameTime(tm),
+                  _T("Add(wxDateSpan) shouldn't modify time") );
+

     return *this;
 }
 
     return *this;
 }
 


@@ -1353,18 +1484,38 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
 // Weekday and monthday stuff
 // ----------------------------------------------------------------------------
 
 // Weekday and monthday stuff
 // ----------------------------------------------------------------------------
 

+bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek, WeekDay weekday)
+{
+    int year = GetYear();
+
+    // Jan 4 always lies in the 1st week of the year
+    Set(4, Jan, year);
+    SetToWeekDayInSameWeek(weekday) += wxDateSpan::Weeks(numWeek);
+
+    if ( GetYear() != year )
+    {
+        // oops... numWeek was too big
+        return FALSE;
+    }
+
+    return TRUE;
+}
+

 wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
                                           int year)
 {
     // take the current month/year if none specified
 wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
                                           int year)
 {
     // take the current month/year if none specified

-    ReplaceDefaultYearMonthWithCurrent(&year, &month);
+    if ( year == Inv_Year )
+        year = GetYear();
+    if ( month == Inv_Month )
+        month = GetMonth();

 
     return Set(GetNumOfDaysInMonth(year, month), month, year);
 }
 
 wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday)
 {
 
     return Set(GetNumOfDaysInMonth(year, month), month, year);
 }
 
 wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday)
 {

-    wxCHECK_MSG( weekday != Inv_WeekDay, ms_InvDateTime, _T("invalid weekday") );
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );

 
     WeekDay wdayThis = GetWeekDay();
     if ( weekday == wdayThis )
 
     WeekDay wdayThis = GetWeekDay();
     if ( weekday == wdayThis )


@@ -1374,17 +1525,17 @@ wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday)
     }
     else if ( weekday < wdayThis )
     {
     }
     else if ( weekday < wdayThis )
     {

-        return Substract(wxTimeSpan::Days(wdayThis - weekday));
+        return Subtract(wxDateSpan::Days(wdayThis - weekday));

     }
     else // weekday > wdayThis
     {
     }
     else // weekday > wdayThis
     {

-        return Add(wxTimeSpan::Days(weekday - wdayThis));
+        return Add(wxDateSpan::Days(weekday - wdayThis));

     }
 }
 
 wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
 {
     }
 }
 
 wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
 {

-    wxCHECK_MSG( weekday != Inv_WeekDay, ms_InvDateTime, _T("invalid weekday") );
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );

 
     int diff;
     WeekDay wdayThis = GetWeekDay();
 
     int diff;
     WeekDay wdayThis = GetWeekDay();


@@ -1403,12 +1554,12 @@ wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
         diff = weekday - wdayThis;
     }
 
         diff = weekday - wdayThis;
     }
 

-    return Add(wxTimeSpan::Days(diff));
+    return Add(wxDateSpan::Days(diff));

 }
 
 wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
 {
 }
 
 wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
 {

-    wxCHECK_MSG( weekday != Inv_WeekDay, ms_InvDateTime, _T("invalid weekday") );
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );

 
     int diff;
     WeekDay wdayThis = GetWeekDay();
 
     int diff;
     WeekDay wdayThis = GetWeekDay();


@@ -1427,7 +1578,7 @@ wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
         diff = wdayThis - weekday;
     }
 
         diff = wdayThis - weekday;
     }
 

-    return Substract(wxTimeSpan::Days(diff));
+    return Subtract(wxDateSpan::Days(diff));

 }
 
 bool wxDateTime::SetToWeekDay(WeekDay weekday,
 }
 
 bool wxDateTime::SetToWeekDay(WeekDay weekday,


@@ -1505,57 +1656,59 @@ wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
     return gs_cumulatedDays[IsLeapYear(tm.year)][tm.mon] + tm.mday;
 }
 
     return gs_cumulatedDays[IsLeapYear(tm.year)][tm.mon] + tm.mday;
 }
 

-wxDateTime::wxDateTime_t wxDateTime::GetWeekOfYear(const TimeZone& tz) const
+wxDateTime::wxDateTime_t wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags,
+                                                   const TimeZone& tz) const

 {
 {

-#if 1
-    // the first week of the year is the one which contains Jan, 4 (according
-    // to ISO standard rule), so the year day N0 = 4 + 7*W always lies in the
-    // week W+1. As any day N = 7*W + 4 + (N - 4)%7, it lies in the same week
-    // as N0 or in the next one.
-
-    // TODO this surely may be optimized - I got confused while writing it
+    if ( flags == Default_First )
+    {
+        flags = GetCountry() == USA ? Sunday_First : Monday_First;
+    }

 
     wxDateTime_t nDayInYear = GetDayOfYear(tz);
 
     wxDateTime_t nDayInYear = GetDayOfYear(tz);

+    wxDateTime_t week;

 
 

-    // the week day of the day lying in the first week
-    WeekDay wdayStart = wxDateTime(4, Jan, GetYear()).GetWeekDay();
-
-    wxDateTime_t week = (nDayInYear - 4) / 7 + 1;
+    WeekDay wd = GetWeekDay(tz);
+    if ( flags == Sunday_First )
+    {
+        week = (nDayInYear - wd + 7) / 7;
+    }
+    else
+    {
+        // have to shift the week days values
+        week = (nDayInYear - (wd - 1 + 7) % 7 + 7) / 7;
+    }

 
 

-    // notice that Sunday shoould be counted as 7, not 0 here!
-    if ( ((nDayInYear - 4) % 7) + (!wdayStart ? 7 : wdayStart) > 7 )
+    // FIXME some more elegant way??
+    WeekDay wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
+    if ( wdYearStart == Wed || wdYearStart == Thu )

     {
         week++;
     }
 
     return week;
     {
         week++;
     }
 
     return week;

-#else // 0
-    // an attempt at doing it simpler - but this doesn't quite work...
-    return (WeekDay)((GetDayOfYear(tz) - (GetWeekDay(tz) - 1 + 7) % 7 + 7) / 7);
-#endif // 0/1

 }
 
 }
 

-wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(const TimeZone& tz) const
+wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
+                                                    const TimeZone& tz) const

 {
 {

-    size_t nWeek = 0;
-
-    wxDateTime dt(*this);
-    do
+    Tm tm = GetTm(tz);
+    wxDateTime dtMonthStart = wxDateTime(1, tm.mon, tm.year);
+    int nWeek = GetWeekOfYear(flags) - dtMonthStart.GetWeekOfYear(flags) + 1;
+    if ( nWeek < 0 )

     {
     {

-        nWeek++;
-
-        dt -= wxTimeSpan::Week();
+        // this may happen for January when Jan, 1 is the last week of the
+        // previous year
+        nWeek += IsLeapYear(tm.year - 1) ? 53 : 52;

     }
     }

-    while ( dt.GetMonth(tz) == GetMonth(tz) );

 
 

-    return nWeek;
+    return (wxDateTime::wxDateTime_t)nWeek;

 }
 
 wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
 {
     int year = GetYear();
 }
 
 wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
 {
     int year = GetYear();

-    wxCHECK_MSG( (0 < yday) && (yday <= GetNumberOfDays(year)),
-                 ms_InvDateTime, _T("invalid year day") );
+    wxDATETIME_CHECK( (0 < yday) && (yday <= GetNumberOfDays(year)),
+                      _T("invalid year day") );

 
     bool isLeap = IsLeapYear(year);
     for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) )
 
     bool isLeap = IsLeapYear(year);
     for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) )


@@ -1633,7 +1786,7 @@ int wxDateTime::IsDST(wxDateTime::Country country) const
 
 wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
 {
 
 wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
 {

-    int secDiff = GetTimeZone() + tz.GetOffset();
+    long secDiff = GetTimeZone() + tz.GetOffset();

 
     // we need to know whether DST is or not in effect for this date unless
     // the test disabled by the caller
 
     // we need to know whether DST is or not in effect for this date unless
     // the test disabled by the caller


@@ -1643,7 +1796,7 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
         secDiff -= 3600;
     }
 
         secDiff -= 3600;
     }
 

-    return Substract(wxTimeSpan::Seconds(secDiff));
+    return Subtract(wxTimeSpan::Seconds(secDiff));

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


@@ -1652,13 +1805,12 @@ 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
 {

-#ifdef __VMS__
-   int time2;
-#endif

     wxCHECK_MSG( format, _T(""), _T("NULL format in wxDateTime::Format") );
 
     wxCHECK_MSG( format, _T(""), _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

     time_t time = GetTicks();
     time_t time = GetTicks();

-    if ( time != (time_t)-1 )
+    if ( (time != (time_t)-1) && !wxStrstr(format, _T("%l")) )

     {
         // use strftime()
         tm *tm;
     {
         // use strftime()
         tm *tm;


@@ -1672,10 +1824,10 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
         }
         else
         {
         }
         else
         {

-            time += tz.GetOffset();
+            time += (int)tz.GetOffset();

 
 

-#ifdef __VMS__ /* time is unsigned so VMS gives a warning on the original */
-            time2 = (int) time;
+#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
+            int time2 = (int) time;

             if ( time2 >= 0 )
 #else
             if ( time >= 0 )
             if ( time2 >= 0 )
 #else
             if ( time >= 0 )


@@ -1700,7 +1852,8 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
     }
 
     // we only parse ANSI C format specifications here, no POSIX 2
     }
 
     // we only parse ANSI C format specifications here, no POSIX 2

-    // complications, no GNU extensions
+    // complications, no GNU extensions but we do add support for a "%l" format
+    // specifier allowing to get the number of milliseconds

     Tm tm = GetTm(tz);
 
     // used for calls to strftime() when we only deal with time
     Tm tm = GetTm(tz);
 
     // used for calls to strftime() when we only deal with time


@@ -1734,6 +1887,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                 break;
 
             case _T('j'):               // day of year has 3 digits
                 break;
 
             case _T('j'):               // day of year has 3 digits

+            case _T('l'):               // milliseconds have 3 digits

                 fmt = _T("%03d");
                 break;
 
                 fmt = _T("%03d");
                 break;
 


@@ -1745,260 +1899,268 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                 fmt = _T("%02d");
         }
 
                 fmt = _T("%02d");
         }
 

-restart:
-        // start of the format specification
-        switch ( *p )
+        bool restart = TRUE;
+        while ( restart )

         {
         {

-            case _T('a'):       // a weekday name
-            case _T('A'):
-                // second parameter should be TRUE for abbreviated names
-                res += GetWeekDayName(tm.GetWeekDay(),
-                                      *p == _T('a') ? Name_Abbr : Name_Full);
-                break;
+            restart = FALSE;

 
 

-            case _T('b'):       // a month name
-            case _T('B'):
-                res += GetMonthName(tm.mon,
-                                    *p == _T('b') ? Name_Abbr : Name_Full);
-                break;
+            // start of the format specification
+            switch ( *p )
+            {
+                case _T('a'):       // a weekday name
+                case _T('A'):
+                    // second parameter should be TRUE for abbreviated names
+                    res += GetWeekDayName(tm.GetWeekDay(),
+                                          *p == _T('a') ? Name_Abbr : Name_Full);
+                    break;

 
 

-            case _T('c'):       // locale default date and time  representation
-            case _T('x'):       // locale default date representation
-                //
-                // the problem: there is no way to know what do these format
-                // specifications correspond to for the current locale.
-                //
-                // the solution: use a hack and still use strftime(): first
-                // 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
-                // 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!
-                //
-                // the bugs: we assume that neither of %c nor %x contains any
-                // fields which may change between the YEAR and real year. For
-                // example, the week number (%U, %W) and the day number (%j)
-                // will change if one of these years is leap and the other one
-                // is not!
-                {
-                    // find the YEAR: normally, for any year X, Jan 1 or the
-                    // year X + 28 is the same weekday as Jan 1 of X (because
-                    // the weekday advances by 1 for each normal X and by 2
-                    // for each leap X, hence by 5 every 4 years or by 35
-                    // which is 0 mod 7 every 28 years) but this rule breaks
-                    // down if there are years between X and Y which are
-                    // divisible by 4 but not leap (i.e. divisible by 100 but
-                    // not 400), hence the correction.
-
-                    int yearReal = GetYear(tz);
-                    int mod28 = yearReal % 28;
-
-                    // be careful to not go too far - we risk to leave the
-                    // supported range
-                    int year;
-                    if ( mod28 < 10 )
-                    {
-                        year = 1988 + mod28;      // 1988 == 0 (mod 28)
-                    }
-                    else
+                case _T('b'):       // a month name
+                case _T('B'):
+                    res += GetMonthName(tm.mon,
+                                        *p == _T('b') ? Name_Abbr : Name_Full);
+                    break;
+
+                case _T('c'):       // locale default date and time  representation
+                case _T('x'):       // locale default date representation
+                    //
+                    // the problem: there is no way to know what do these format
+                    // specifications correspond to for the current locale.
+                    //
+                    // the solution: use a hack and still use strftime(): first
+                    // 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
+                    // 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!
+                    //
+                    // the bugs: we assume that neither of %c nor %x contains any
+                    // fields which may change between the YEAR and real year. For
+                    // example, the week number (%U, %W) and the day number (%j)
+                    // will change if one of these years is leap and the other one
+                    // is not!

                     {
                     {

-                        year = 1970 + mod28 - 10; // 1970 == 10 (mod 28)
-                    }
+                        // find the YEAR: normally, for any year X, Jan 1 or the
+                        // year X + 28 is the same weekday as Jan 1 of X (because
+                        // the weekday advances by 1 for each normal X and by 2
+                        // for each leap X, hence by 5 every 4 years or by 35
+                        // which is 0 mod 7 every 28 years) but this rule breaks
+                        // down if there are years between X and Y which are
+                        // divisible by 4 but not leap (i.e. divisible by 100 but
+                        // not 400), hence the correction.
+
+                        int yearReal = GetYear(tz);
+                        int mod28 = yearReal % 28;
+
+                        // be careful to not go too far - we risk to leave the
+                        // supported range
+                        int year;
+                        if ( mod28 < 10 )
+                        {
+                            year = 1988 + mod28;      // 1988 == 0 (mod 28)
+                        }
+                        else
+                        {
+                            year = 1970 + mod28 - 10; // 1970 == 10 (mod 28)
+                        }

 
 

-                    int nCentury = year / 100,
-                        nCenturyReal = yearReal / 100;
+                        int nCentury = year / 100,
+                            nCenturyReal = yearReal / 100;

 
 

-                    // need to adjust for the years divisble by 400 which are
-                    // not leap but are counted like leap ones if we just take
-                    // the number of centuries in between for nLostWeekDays
-                    int nLostWeekDays = (nCentury - nCenturyReal) -
-                                        (nCentury / 4 - nCenturyReal / 4);
+                        // need to adjust for the years divisble by 400 which are
+                        // not leap but are counted like leap ones if we just take
+                        // the number of centuries in between for nLostWeekDays
+                        int nLostWeekDays = (nCentury - nCenturyReal) -
+                                            (nCentury / 4 - nCenturyReal / 4);

 
 

-                    // we have to gain back the "lost" weekdays: note that the
-                    // effect of this loop is to not do anything to
-                    // nLostWeekDays (which we won't use any more), but to
-                    // (indirectly) set the year correctly
-                    while ( (nLostWeekDays % 7) != 0 )
-                    {
-                        nLostWeekDays += year++ % 4 ? 1 : 2;
-                    }
+                        // we have to gain back the "lost" weekdays: note that the
+                        // effect of this loop is to not do anything to
+                        // nLostWeekDays (which we won't use any more), but to
+                        // (indirectly) set the year correctly
+                        while ( (nLostWeekDays % 7) != 0 )
+                        {
+                            nLostWeekDays += year++ % 4 ? 1 : 2;
+                        }

 
 

-                    // at any rate, we couldn't go further than 1988 + 9 + 28!
-                    wxASSERT_MSG( year < 2030,
-                                  _T("logic error in wxDateTime::Format") );
+                        // at any rate, we couldn't go further than 1988 + 9 + 28!
+                        wxASSERT_MSG( year < 2030,
+                                      _T("logic error in wxDateTime::Format") );

 
 

-                    wxString strYear, strYear2;
-                    strYear.Printf(_T("%d"), year);
-                    strYear2.Printf(_T("%d"), year % 100);
+                        wxString strYear, strYear2;
+                        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!)
-                    wxString fmt = format;
-                    wxString replacement = (wxChar)-1;
-                    while ( fmt.Find(replacement) != wxNOT_FOUND )
-                    {
-                        replacement << (wxChar)-1;
-                    }
+                        // find two strings not occuring in format (this is surely
+                        // not optimal way of doing it... improvements welcome!)
+                        wxString fmt = format;
+                        wxString replacement = (wxChar)-1;
+                        while ( fmt.Find(replacement) != wxNOT_FOUND )
+                        {
+                            replacement << (wxChar)-1;
+                        }

 
 

-                    wxString replacement2 = (wxChar)-2;
-                    while ( fmt.Find(replacement) != wxNOT_FOUND )
-                    {
-                        replacement << (wxChar)-2;
-                    }
+                        wxString replacement2 = (wxChar)-2;
+                        while ( fmt.Find(replacement) != wxNOT_FOUND )
+                        {
+                            replacement << (wxChar)-2;
+                        }

 
 

-                    // replace all occurences of year with it
-                    bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
-                    if ( !wasReplaced )
-                        wasReplaced = fmt.Replace(strYear2, replacement2) > 0;
+                        // replace all occurences of year with it
+                        bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
+                        if ( !wasReplaced )
+                            wasReplaced = fmt.Replace(strYear2, replacement2) > 0;
+
+                        // use strftime() to format the same date but in supported
+                        // year
+                        //
+                        // NB: we assume that strftime() doesn't check for the
+                        //     date validity and will happily format the date
+                        //     corresponding to Feb 29 of a non leap year (which
+                        //     may happen if yearReal was leap and year is not)
+                        struct tm tmAdjusted;
+                        InitTm(tmAdjusted);
+                        tmAdjusted.tm_hour = tm.hour;
+                        tmAdjusted.tm_min = tm.min;
+                        tmAdjusted.tm_sec = tm.sec;
+                        tmAdjusted.tm_wday = tm.GetWeekDay();
+                        tmAdjusted.tm_yday = GetDayOfYear();
+                        tmAdjusted.tm_mday = tm.mday;
+                        tmAdjusted.tm_mon = tm.mon;
+                        tmAdjusted.tm_year = year - 1900;
+                        tmAdjusted.tm_isdst = 0; // no DST, already adjusted
+                        wxString str = CallStrftime(*p == _T('c') ? _T("%c")
+                                                                  : _T("%x"),
+                                                    &tmAdjusted);
+
+                        // now replace the occurence 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);
+
+                        // and replace back all occurences of replacement string
+                        if ( wasReplaced )
+                        {
+                            str.Replace(replacement2, strYear2);
+                            str.Replace(replacement, strYear);
+                        }

 
 

-                    // use strftime() to format the same date but in supported
-                    // year
-                    //
-                    // NB: we assume that strftime() doesn't check for the
-                    //     date validity and will happily format the date
-                    //     corresponding to Feb 29 of a non leap year (which
-                    //     may happen if yearReal was leap and year is not)
-                    struct tm tmAdjusted;
-                    InitTm(tmAdjusted);
-                    tmAdjusted.tm_hour = tm.hour;
-                    tmAdjusted.tm_min = tm.min;
-                    tmAdjusted.tm_sec = tm.sec;
-                    tmAdjusted.tm_wday = tm.GetWeekDay();
-                    tmAdjusted.tm_yday = GetDayOfYear();
-                    tmAdjusted.tm_mday = tm.mday;
-                    tmAdjusted.tm_mon = tm.mon;
-                    tmAdjusted.tm_year = year - 1900;
-                    tmAdjusted.tm_isdst = 0; // no DST, already adjusted
-                    wxString str = CallStrftime(*p == _T('c') ? _T("%c")
-                                                              : _T("%x"),
-                                                &tmAdjusted);
-
-                    // now replace the occurence 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);
-
-                    // and replace back all occurences of replacement string
-                    if ( wasReplaced )
-                    {
-                        str.Replace(replacement2, strYear2);
-                        str.Replace(replacement, strYear);
+                        res += str;

                     }
                     }

+                    break;

 
 

-                    res += str;
-                }
-                break;
+                case _T('d'):       // day of a month (01-31)
+                    res += wxString::Format(fmt, tm.mday);
+                    break;

 
 

-            case _T('d'):       // day of a month (01-31)
-                res += wxString::Format(fmt, tm.mday);
-                break;
+                case _T('H'):       // hour in 24h format (00-23)
+                    res += wxString::Format(fmt, tm.hour);
+                    break;

 
 

-            case _T('H'):       // hour in 24h format (00-23)
-                res += wxString::Format(fmt, tm.hour);
-                break;
+                case _T('I'):       // hour in 12h format (01-12)
+                    {
+                        // 24h -> 12h, 0h -> 12h too
+                        int hour12 = tm.hour > 12 ? tm.hour - 12
+                                                  : tm.hour ? tm.hour : 12;
+                        res += wxString::Format(fmt, hour12);
+                    }
+                    break;

 
 

-            case _T('I'):       // hour in 12h format (01-12)
-                {
-                    // 24h -> 12h, 0h -> 12h too
-                    int hour12 = tm.hour > 12 ? tm.hour - 12
-                                              : tm.hour ? tm.hour : 12;
-                    res += wxString::Format(fmt, hour12);
-                }
-                break;
+                case _T('j'):       // day of the year
+                    res += wxString::Format(fmt, GetDayOfYear(tz));
+                    break;

 
 

-            case _T('j'):       // day of the year
-                res += wxString::Format(fmt, GetDayOfYear(tz));
-                break;
+                case _T('l'):       // milliseconds (NOT STANDARD)
+                    res += wxString::Format(fmt, GetMillisecond(tz));
+                    break;

 
 

-            case _T('m'):       // month as a number (01-12)
-                res += wxString::Format(fmt, tm.mon + 1);
-                break;
+                case _T('m'):       // month as a number (01-12)
+                    res += wxString::Format(fmt, tm.mon + 1);
+                    break;

 
 

-            case _T('M'):       // minute as a decimal number (00-59)
-                res += wxString::Format(fmt, tm.min);
-                break;
+                case _T('M'):       // minute as a decimal number (00-59)
+                    res += wxString::Format(fmt, tm.min);
+                    break;

 
 

-            case _T('p'):       // AM or PM string
-                res += CallStrftime(_T("%p"), &tmTimeOnly);
-                break;
+                case _T('p'):       // AM or PM string
+                    res += CallStrftime(_T("%p"), &tmTimeOnly);
+                    break;

 
 

-            case _T('S'):       // second as a decimal number (00-61)
-                res += wxString::Format(fmt, tm.sec);
-                break;
+                case _T('S'):       // second as a decimal number (00-61)
+                    res += wxString::Format(fmt, tm.sec);
+                    break;

 
 

-            case _T('U'):       // week number in the year (Sunday 1st week day)
-                {
-                    int week = (GetDayOfYear(tz) - tm.GetWeekDay() + 7) / 7;
-                    res += wxString::Format(fmt, week);
-                }
-                break;
+                case _T('U'):       // week number in the year (Sunday 1st week day)
+                    res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
+                    break;

 
 

-            case _T('W'):       // week number in the year (Monday 1st week day)
-                res += wxString::Format(fmt, GetWeekOfYear(tz));
-                break;
+                case _T('W'):       // week number in the year (Monday 1st week day)
+                    res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz));
+                    break;

 
 

-            case _T('w'):       // weekday as a number (0-6), Sunday = 0
-                res += wxString::Format(fmt, tm.GetWeekDay());
-                break;
+                case _T('w'):       // weekday as a number (0-6), Sunday = 0
+                    res += wxString::Format(fmt, tm.GetWeekDay());
+                    break;

 
 

-            // case _T('x'): -- handled with "%c"
+                // case _T('x'): -- handled with "%c"

 
 

-            case _T('X'):       // locale default time representation
-                // just use strftime() to format the time for us
-                res += CallStrftime(_T("%X"), &tmTimeOnly);
-                break;
+                case _T('X'):       // locale default time representation
+                    // just use strftime() to format the time for us
+                    res += CallStrftime(_T("%X"), &tmTimeOnly);
+                    break;

 
 

-            case _T('y'):       // year without century (00-99)
-                res += wxString::Format(fmt, tm.year % 100);
-                break;
+                case _T('y'):       // year without century (00-99)
+                    res += wxString::Format(fmt, tm.year % 100);
+                    break;

 
 

-            case _T('Y'):       // year with century
-                res += wxString::Format(fmt, tm.year);
-                break;
+                case _T('Y'):       // year with century
+                    res += wxString::Format(fmt, tm.year);
+                    break;

 
 

-            case _T('Z'):       // timezone name
-                res += CallStrftime(_T("%Z"), &tmTimeOnly);
-                break;
+                case _T('Z'):       // timezone name
+                    res += CallStrftime(_T("%Z"), &tmTimeOnly);
+                    break;

 
 

-            default:
-                // is it the format width?
-                fmt.Empty();
-                while ( *p == _T('-') || *p == _T('+') ||
-                        *p == _T(' ') || wxIsdigit(*p) )
-                {
-                    fmt += *p;
-                }
+                default:
+                    // is it the format width?
+                    fmt.Empty();
+                    while ( *p == _T('-') || *p == _T('+') ||
+                            *p == _T(' ') || wxIsdigit(*p) )
+                    {
+                        fmt += *p;
+                    }

 
 

-                if ( !fmt.IsEmpty() )
-                {
-                    // we've only got the flags and width so far in fmt
-                    fmt.Prepend(_T('%'));
-                    fmt.Append(_T('d'));
+                    if ( !fmt.IsEmpty() )
+                    {
+                        // we've only got the flags and width so far in fmt
+                        fmt.Prepend(_T('%'));
+                        fmt.Append(_T('d'));

 
 

-                    goto restart;
-                }
+                        restart = TRUE;

 
 

-                // no, it wasn't the width
-                wxFAIL_MSG(_T("unknown format specificator"));
+                        break;
+                    }

 
 

-                // fall through and just copy it nevertheless
+                    // no, it wasn't the width
+                    wxFAIL_MSG(_T("unknown format specificator"));

 
 

-            case _T('%'):       // a percent sign
-                res += *p;
-                break;
+                    // fall through and just copy it nevertheless

 
 

-            case 0:             // the end of string
-                wxFAIL_MSG(_T("missing format at the end of string"));
+                case _T('%'):       // a percent sign
+                    res += *p;
+                    break;

 
 

-                // just put the '%' which was the last char in format
-                res += _T('%');
-                break;
+                case 0:             // the end of string
+                    wxFAIL_MSG(_T("missing format at the end of string"));
+
+                    // just put the '%' which was the last char in format
+                    res += _T('%');
+                    break;
+            }

         }
     }
 
         }
     }
 


@@ -2295,11 +2457,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
 
     // the spec was correct
     Set(day, mon, year, hour, min, sec);
 
     // the spec was correct
     Set(day, mon, year, hour, min, sec);

-#ifndef __BORLANDC__ // The following line doesn't compile with BC++
-    MakeTimezone(60*(wxDateTime_t)offset);
-#else
-    wxMessageBox("ParseRfc822Date doesn't with BC++ yet, sorry.");
-#endif
+    MakeTimezone((wxDateTime_t)(60*offset));

 
     return p;
 }
 
     return p;
 }


@@ -2367,7 +2525,17 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
         }
 
         // start of a format specification
         }
 
         // start of a format specification

-        switch ( *++fmt )
+
+        // parse the optional width
+        size_t width = 0;
+        while ( isdigit(*++fmt) )
+        {
+            width *= 10;
+            width += *fmt - _T('0');
+        }
+
+        // then the format itself
+        switch ( *fmt )

         {
             case _T('a'):       // a weekday name
             case _T('A'):
         {
             case _T('a'):       // a weekday name
             case _T('A'):


@@ -2440,7 +2608,8 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 break;
 
             case _T('d'):       // day of a month (01-31)
                 break;
 
             case _T('d'):       // day of a month (01-31)

-                if ( !GetNumericToken(input, &num) || (num > 31) )
+                if ( !GetNumericToken(width, input, &num) ||
+                        (num > 31) || (num < 1) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2453,7 +2622,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 break;
 
             case _T('H'):       // hour in 24h format (00-23)
                 break;
 
             case _T('H'):       // hour in 24h format (00-23)

-                if ( !GetNumericToken(input, &num) || (num > 23) )
+                if ( !GetNumericToken(width, input, &num) || (num > 23) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2464,7 +2633,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 break;
 
             case _T('I'):       // hour in 12h format (01-12)
                 break;
 
             case _T('I'):       // hour in 12h format (01-12)

-                if ( !GetNumericToken(input, &num) || !num || (num > 12) )
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2472,11 +2641,11 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
 
                 haveHour = TRUE;
                 hourIsIn12hFormat = TRUE;
 
                 haveHour = TRUE;
                 hourIsIn12hFormat = TRUE;

-                hour = num % 12;        // 12 should be 0
+                hour = (wxDateTime_t)(num % 12);        // 12 should be 0

                 break;
 
             case _T('j'):       // day of the year
                 break;
 
             case _T('j'):       // day of the year

-                if ( !GetNumericToken(input, &num) || !num || (num > 366) )
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 366) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2487,7 +2656,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 break;
 
             case _T('m'):       // month as a number (01-12)
                 break;
 
             case _T('m'):       // month as a number (01-12)

-                if ( !GetNumericToken(input, &num) || !num || (num > 12) )
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2498,7 +2667,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 break;
 
             case _T('M'):       // minute as a decimal number (00-59)
                 break;
 
             case _T('M'):       // minute as a decimal number (00-59)

-                if ( !GetNumericToken(input, &num) || (num > 59) )
+                if ( !GetNumericToken(width, input, &num) || (num > 59) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2562,7 +2731,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 }
 
             case _T('S'):       // second as a decimal number (00-61)
                 }
 
             case _T('S'):       // second as a decimal number (00-61)

-                if ( !GetNumericToken(input, &num) || (num > 61) )
+                if ( !GetNumericToken(width, input, &num) || (num > 61) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2592,7 +2761,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 break;
 
             case _T('w'):       // weekday as a number (0-6), Sunday = 0
                 break;
 
             case _T('w'):       // weekday as a number (0-6), Sunday = 0

-                if ( !GetNumericToken(input, &num) || (wday > 6) )
+                if ( !GetNumericToken(width, input, &num) || (wday > 6) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2721,18 +2890,21 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 break;
 
             case _T('y'):       // year without century (00-99)
                 break;
 
             case _T('y'):       // year without century (00-99)

-                if ( !GetNumericToken(input, &num) || (num > 99) )
+                if ( !GetNumericToken(width, input, &num) || (num > 99) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 }
 
                 haveYear = TRUE;
                 {
                     // no match
                     return (wxChar *)NULL;
                 }
 
                 haveYear = TRUE;

-                year = 1900 + num;
+
+                // TODO should have an option for roll over date instead of
+                //      hard coding it here
+                year = (num > 30 ? 1900 : 2000) + (wxDateTime_t)num;

                 break;
 
             case _T('Y'):       // year with century
                 break;
 
             case _T('Y'):       // year with century

-                if ( !GetNumericToken(input, &num) )
+                if ( !GetNumericToken(width, input, &num) )

                 {
                     // no match
                     return (wxChar *)NULL;
                 {
                     // no match
                     return (wxChar *)NULL;


@@ -2771,7 +2943,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
         // take this date as default
         tmDef = dateDef.GetTm();
     }
         // take this date as default
         tmDef = dateDef.GetTm();
     }

-    else if ( m_time != 0 )
+    else if ( IsValid() )

     {
         // if this date is valid, don't change it
         tmDef = GetTm();
     {
         // if this date is valid, don't change it
         tmDef = GetTm();


@@ -2872,18 +3044,43 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
     while ( wxIsspace(*p) )
         p++;
 
     while ( wxIsspace(*p) )
         p++;
 

-    wxString today = _T("today");
-    size_t len = today.length();
-    if ( wxString(p, len).CmpNoCase(today) == 0 )
+    // some special cases
+    static struct

     {
     {

-        // nothing can follow this, so stop here
-        p += len;
+        const wxChar *str;
+        int dayDiffFromToday;
+    } literalDates[] =
+    {
+        { wxTRANSLATE("today"),             0 },
+        { wxTRANSLATE("yesterday"),        -1 },
+        { wxTRANSLATE("tomorrow"),          1 },
+    };

 
 

-        *this = Today();
+    for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ )
+    {
+        wxString date = wxGetTranslation(literalDates[n].str);
+        size_t len = date.length();
+        if ( wxStrlen(p) >= len && (wxString(p, len).CmpNoCase(date) == 0) )
+        {
+            // 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;
+        }

     }
 
     }
 

+    // We try to guess what we have here: for each new (numeric) token, we
+    // determine if it can be a month, day or a year. Of course, there is an
+    // ambiguity as some numbers may be days as well as months, so we also
+    // have the ability to back track.
+

     // what do we have?
     bool haveDay = FALSE,       // the months day?
          haveWDay = FALSE,      // the day of week?
     // what do we have?
     bool haveDay = FALSE,       // the months day?
          haveWDay = FALSE,      // the day of week?


@@ -2897,10 +3094,14 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
     int year = 0;
 
     // tokenize the string
     int year = 0;
 
     // tokenize the string

-    wxStringTokenizer tok(p, _T(",/-\t "));
+    size_t nPosCur = 0;
+    static const wxChar *dateDelimiters = _T(".,/-\t\n ");
+    wxStringTokenizer tok(p, dateDelimiters);

     while ( tok.HasMoreTokens() )
     {
         wxString token = tok.GetNextToken();
     while ( tok.HasMoreTokens() )
     {
         wxString token = tok.GetNextToken();

+        if ( !token )
+            continue;

 
         // is it a number?
         unsigned long val;
 
         // is it a number?
         unsigned long val;


@@ -2910,125 +3111,85 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
 
             bool isDay = FALSE,
                  isMonth = FALSE,
 
             bool isDay = FALSE,
                  isMonth = FALSE,

-                 // only years are counted from 0
-                 isYear = (val == 0) || (val > 31);
-            if ( !isYear )
+                 isYear = FALSE;
+
+            if ( !haveMon && val > 0 && val <= 12 )

             {
             {

-                // may be the month or month day or the year, assume the
-                // month day by default and fallback to month if the range
-                // allow it or to the year if our assumption doesn't work
-                if ( haveDay )
+                // assume it is month
+                isMonth = TRUE;
+            }
+            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

                 {
                 {

-                    // we already have the day, so may only be a month or year
-                    if ( val > 12 )
-                    {
-                        isYear = TRUE;
-                    }
-                    else
-                    {
-                        isMonth = TRUE;
-                    }
+                    isYear = TRUE;

                 }
                 }

-                else // it may be day
+                else

                 {
                     isDay = TRUE;
                 {
                     isDay = TRUE;

-
-                    // check the range
-                    if ( haveMon )
-                    {
-                        if ( val > GetNumOfDaysInMonth(haveYear ? year
-                                                                : Inv_Year,
-                                                       mon) )
-                        {
-                            // oops, it can't be a day finally
-                            isDay = FALSE;
-
-                            if ( val > 12 )
-                            {
-                                isYear = TRUE;
-                            }
-                            else
-                            {
-                                isMonth = TRUE;
-                            }
-                        }
-                    }

                 }
             }
 
                 }
             }
 

-            // remember that we have this and stop the scan if it's the second
-            // time we find this, except for the day logic (see there)

             if ( isYear )
             {
                 if ( haveYear )
             if ( isYear )
             {
                 if ( haveYear )

-                {

                     break;
                     break;

-                }

 
                 haveYear = TRUE;
 
 
                 haveYear = TRUE;
 

-                // no roll over - 99 means 99, not 1999 for us
-                year = val;
+                year = (wxDateTime_t)val;

             }
             }

-            else if ( isMonth )
+            else if ( isDay )

             {
             {

-                if ( haveMon )
-                {
+                if ( haveDay )

                     break;
                     break;

-                }

 
 

-                haveMon = TRUE;
+                haveDay = TRUE;

 
 

-                mon = (wxDateTime::Month)val;
+                day = (wxDateTime_t)val;

             }
             }

-            else
+            else if ( isMonth )

             {
             {

-                wxASSERT_MSG( isDay, _T("logic error") );
-
-                if ( haveDay )
-                {
-                    // may be were mistaken when we found it for the first
-                    // time? may be it was a month or year instead?
-                    //
-                    // this ability to "backtrack" allows us to correctly parse
-                    // both things like 01/13 and 13/01 - but, of course, we
-                    // still can't resolve the ambiguity in 01/02 (it will be
-                    // Feb 1 for us, not Jan 2 as americans might expect!)
-                    if ( (day <= 12) && !haveMon )
-                    {
-                        // exchange day and month
-                        mon = (wxDateTime::Month)day;
-
-                        haveMon = TRUE;
-                    }
-                    else if ( !haveYear )
-                    {
-                        // exchange day and year
-                        year = day;
-
-                        haveYear = TRUE;
-                    }
-                }
-
-                haveDay = TRUE;
+                haveMon = TRUE;

 
 

-                day = val;
+                mon = (Month)(val - 1);

             }
         }
         else // not a number
         {
             }
         }
         else // not a number
         {

-            mon = GetMonthFromName(token, Name_Full | Name_Abbr);
-            if ( mon != Inv_Month )
+            // be careful not to overwrite the current mon value
+            Month mon2 = GetMonthFromName(token, Name_Full | Name_Abbr);
+            if ( mon2 != Inv_Month )

             {
                 // it's a month
                 if ( haveMon )
                 {
             {
                 // it's a month
                 if ( haveMon )
                 {

-                    break;
+                    // but we already have a month - maybe we guessed wrong?
+                    if ( !haveDay )
+                    {
+                        // 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;
+                    }
+                    else
+                    {
+                        // could possible be the year (doesn't the year come
+                        // before the month in the japanese format?) (FIXME)
+                        break;
+                    }

                 }
 
                 }
 

+                mon = mon2;
+

                 haveMon = TRUE;
             }
                 haveMon = TRUE;
             }

-            else
+            else // not a valid month name

             {
                 wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
                 if ( wday != Inv_WeekDay )
             {
                 wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
                 if ( wday != Inv_WeekDay )


@@ -3041,7 +3202,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
 
                     haveWDay = TRUE;
                 }
 
                     haveWDay = TRUE;
                 }

-                else
+                else // not a valid weekday name

                 {
                     // try the ordinals
                     static const wxChar *ordinals[] =
                 {
                     // try the ordinals
                     static const wxChar *ordinals[] =


@@ -3067,7 +3228,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                         wxTRANSLATE("nineteenth"),
                         wxTRANSLATE("twentieth"),
                         // that's enough - otherwise we'd have problems with
                         wxTRANSLATE("nineteenth"),
                         wxTRANSLATE("twentieth"),
                         // that's enough - otherwise we'd have problems with

-                        // composite (or not) ordinals otherwise
+                        // composite (or not) ordinals

                     };
 
                     size_t n;
                     };
 
                     size_t n;


@@ -3096,23 +3257,25 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
 
                     haveDay = TRUE;
 
 
                     haveDay = TRUE;
 

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

                 }
             }
         }
                 }
             }
         }

+
+        nPosCur = tok.GetPosition();

     }
 
     // either no more tokens or the scan was stopped by something we couldn't
     // parse - in any case, see if we can construct a date from what we have
     if ( !haveDay && !haveWDay )
     {
     }
 
     // either no more tokens or the scan was stopped by something we couldn't
     // parse - in any case, see if we can construct a date from what we have
     if ( !haveDay && !haveWDay )
     {

-        wxLogDebug(_T("no day, no weekday hence no date."));
+        wxLogDebug(_T("ParseDate: no day, no weekday hence no date."));

 
         return (wxChar *)NULL;
     }
 
     if ( haveWDay && (haveMon || haveYear || haveDay) &&
 
         return (wxChar *)NULL;
     }
 
     if ( haveWDay && (haveMon || haveYear || haveDay) &&

-         !(haveMon && haveMon && haveYear) )
+         !(haveDay && haveMon && haveYear) )

     {
         // without adjectives (which we don't support here) the week day only
         // makes sense completely separately or with the full date
     {
         // without adjectives (which we don't support here) the week day only
         // makes sense completely separately or with the full date


@@ -3120,6 +3283,38 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
         return (wxChar *)NULL;
     }
 
         return (wxChar *)NULL;
     }
 

+    if ( !haveWDay && haveYear && !(haveDay && haveMon) )
+    {
+        // may be we have month and day instead of day and year?
+        if ( haveDay && !haveMon )
+        {
+            if ( day <= 12  )
+            {
+                // exchange day and month
+                mon = (wxDateTime::Month)(day - 1);
+
+                // we're in the current year then
+                if ( (year > 0) &&
+                        (unsigned)year <= GetNumOfDaysInMonth(Inv_Year, mon) )
+                {
+                    day = year;
+
+                    haveMon = TRUE;
+                    haveYear = FALSE;
+                }
+                //else: no, can't exchange, leave haveMon == FALSE
+            }
+        }
+
+        if ( !haveMon )
+        {
+            // if we give the year, month and day must be given too
+            wxLogDebug(_T("ParseDate: day and month should be specified if year is."));
+
+            return (wxChar *)NULL;
+        }
+    }
+

     if ( !haveMon )
     {
         mon = GetCurrentMonth();
     if ( !haveMon )
     {
         mon = GetCurrentMonth();


@@ -3140,6 +3335,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
             if ( GetWeekDay() != wday )
             {
                 // inconsistency detected
             if ( GetWeekDay() != wday )
             {
                 // inconsistency detected

+                wxLogDebug(_T("ParseDate: inconsistent day/weekday."));
+

                 return (wxChar *)NULL;
             }
         }
                 return (wxChar *)NULL;
             }
         }


@@ -3151,8 +3348,16 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
         SetToWeekDayInSameWeek(wday);
     }
 
         SetToWeekDayInSameWeek(wday);
     }
 

-    // return the pointer to the next char
-    return p + wxStrlen(p) - wxStrlen(tok.GetString());
+    // return the pointer to the first unparsed char
+    p += nPosCur;
+    if ( nPosCur && wxStrchr(dateDelimiters, *(p - 1)) )
+    {
+        // if we couldn't parse the token after the delimiter, put back the
+        // delimiter as well
+        p--;
+    }
+
+    return p;

 }
 
 const wxChar *wxDateTime::ParseTime(const wxChar *time)
 }
 
 const wxChar *wxDateTime::ParseTime(const wxChar *time)


@@ -3183,8 +3388,12 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
         }
     }
 
         }
     }
 

-    // try all time formats we may think about starting with the standard one
-    const wxChar *result = ParseFormat(time, _T("%X"));
+    // try all time formats we may think about in the order from longest to
+    // shortest
+
+    // 12hour with AM/PM?
+    const wxChar *result = ParseFormat(time, _T("%I:%M:%S %p"));
+

     if ( !result )
     {
         // normally, it's the same, but why not try it?
     if ( !result )
     {
         // normally, it's the same, but why not try it?


@@ -3193,8 +3402,8 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
 
     if ( !result )
     {
 
     if ( !result )
     {

-        // 12hour with AM/PM?
-        result = ParseFormat(time, _T("%I:%M:%S %p"));
+        // 12hour with AM/PM but without seconds?
+        result = ParseFormat(time, _T("%I:%M %p"));

     }
 
     if ( !result )
     }
 
     if ( !result )


@@ -3205,8 +3414,8 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
 
     if ( !result )
     {
 
     if ( !result )
     {

-        // 12hour with AM/PM but without seconds?
-        result = ParseFormat(time, _T("%I:%M %p"));
+        // just the hour and AM/PM?
+        result = ParseFormat(time, _T("%I %p"));

     }
 
     if ( !result )
     }
 
     if ( !result )


@@ -3217,8 +3426,9 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
 
     if ( !result )
     {
 
     if ( !result )
     {

-        // just the hour and AM/PM?
-        result = ParseFormat(time, _T("%I %p"));
+        // parse the standard format: normally it is one of the formats above
+        // but it may be set to something completely different by the user
+        result = ParseFormat(time, _T("%X"));

     }
 
     // TODO: parse timezones
     }
 
     // TODO: parse timezones


@@ -3226,10 +3436,32 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
     return result;
 }
 
     return result;
 }
 

+// ----------------------------------------------------------------------------
+// Workdays and holidays support
+// ----------------------------------------------------------------------------
+
+bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const
+{
+    return !wxDateTimeHolidayAuthority::IsHoliday(*this);
+}
+

 // ============================================================================
 // wxTimeSpan
 // ============================================================================
 
 // ============================================================================
 // wxTimeSpan
 // ============================================================================
 

+// 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
+enum TimeSpanPart
+{
+    Part_Week,
+    Part_Day,
+    Part_Hour,
+    Part_Min,
+    Part_Sec,
+    Part_MSec
+};
+

 // not all strftime(3) format specifiers make sense here because, for example,
 // a time span doesn't have a year nor a timezone
 //
 // not all strftime(3) format specifiers make sense here because, for example,
 // a time span doesn't have a year nor a timezone
 //


@@ -3251,63 +3483,249 @@ wxString wxTimeSpan::Format(const wxChar *format) const
     wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") );
 
     wxString str;
     wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") );
 
     wxString str;

-    str.Alloc(strlen(format));
+    str.Alloc(wxStrlen(format));
+
+    // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */)
+    //
+    // Then, of course, ts.Format("%H:%M:%S") must return "01:02:03", but the
+    // question is what should ts.Format("%S") do? The code here returns "3273"
+    // in this case (i.e. the total number of seconds, not just seconds % 60)
+    // because, for me, this call means "give me entire time interval in
+    // seconds" and not "give me the seconds part of the time interval"
+    //
+    // If we agree that it should behave like this, it is clear that the
+    // interpretation of each format specifier depends on the presence of the
+    // other format specs in the string: if there was "%H" before "%M", we
+    // should use GetMinutes() % 60, otherwise just GetMinutes() &c
+
+    // we remember the most important unit found so far
+    TimeSpanPart partBiggest = Part_MSec;

 
 

-    for ( const wxChar *pch = format; pch; pch++ )
+    for ( const wxChar *pch = format; *pch; pch++ )

     {
         wxChar ch = *pch;
 
     {
         wxChar ch = *pch;
 

-        if ( ch == '%' )
+        if ( ch == _T('%') )

         {
         {

-            wxString tmp;
+            // the start of the format specification of the printf() below
+            wxString fmtPrefix = _T('%');

 
 

-            ch = *pch++;
+            // the number
+            long n;
+
+            ch = *++pch;    // get the format spec char

             switch ( ch )
             {
                 default:
                     wxFAIL_MSG( _T("invalid format character") );
                     // fall through
 
             switch ( ch )
             {
                 default:
                     wxFAIL_MSG( _T("invalid format character") );
                     // fall through
 

-                case '%':
-                    // will get to str << ch below
-                    break;
+                case _T('%'):
+                    str += ch;

 
 

-                case 'D':
-                    tmp.Printf(_T("%d"), GetDays());
+                    // skip the part below switch
+                    continue;
+
+                case _T('D'):
+                    n = GetDays();
+                    if ( partBiggest < Part_Day )
+                    {
+                        n %= DAYS_PER_WEEK;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Day;
+                    }

                     break;
 
                     break;
 

-                case 'E':
-                    tmp.Printf(_T("%d"), GetWeeks());
+                case _T('E'):
+                    partBiggest = Part_Week;
+                    n = GetWeeks();

                     break;
 
                     break;
 

-                case 'H':
-                    tmp.Printf(_T("%02d"), GetHours());
+                case _T('H'):
+                    n = GetHours();
+                    if ( partBiggest < Part_Hour )
+                    {
+                        n %= HOURS_PER_DAY;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Hour;
+                    }
+
+                    fmtPrefix += _T("02");

                     break;
 
                     break;
 

-                case 'l':
-                    tmp.Printf(_T("%03ld"), GetMilliseconds().ToLong());
+                case _T('l'):
+                    n = GetMilliseconds().ToLong();
+                    if ( partBiggest < Part_MSec )
+                    {
+                        n %= 1000;
+                    }
+                    //else: no need to reset partBiggest to Part_MSec, it is
+                    //      the least significant one anyhow
+
+                    fmtPrefix += _T("03");

                     break;
 
                     break;
 

-                case 'M':
-                    tmp.Printf(_T("%02d"), GetMinutes());
+                case _T('M'):
+                    n = GetMinutes();
+                    if ( partBiggest < Part_Min )
+                    {
+                        n %= MIN_PER_HOUR;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Min;
+                    }
+
+                    fmtPrefix += _T("02");

                     break;
 
                     break;
 

-                case 'S':
-                    tmp.Printf(_T("%02ld"), GetSeconds().ToLong());
+                case _T('S'):
+                    n = GetSeconds().ToLong();
+                    if ( partBiggest < Part_Sec )
+                    {
+                        n %= SEC_PER_MIN;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Sec;
+                    }
+
+                    fmtPrefix += _T("02");

                     break;
             }
 
                     break;
             }
 

-            if ( !!tmp )
-            {
-                str += tmp;
+            str += wxString::Format(fmtPrefix + _T("ld"), n);
+        }
+        else
+        {
+            // normal character, just copy
+            str += ch;
+        }
+    }

 
 

-                // skip str += ch below
-                continue;
-            }
+    return str;
+}
+
+// ============================================================================
+// wxDateTimeHolidayAuthority and related classes
+// ============================================================================
+
+#include "wx/arrimpl.cpp"
+
+WX_DEFINE_OBJARRAY(wxDateTimeArray);
+
+static int wxCMPFUNC_CONV
+wxDateTimeCompareFunc(wxDateTime **first, wxDateTime **second)
+{
+    wxDateTime dt1 = **first,
+               dt2 = **second;
+
+    return dt1 == dt2 ? 0 : dt1 < dt2 ? -1 : +1;
+}
+
+// ----------------------------------------------------------------------------
+// wxDateTimeHolidayAuthority
+// ----------------------------------------------------------------------------
+
+wxHolidayAuthoritiesArray wxDateTimeHolidayAuthority::ms_authorities;
+
+/* static */
+bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
+{
+    size_t count = ms_authorities.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( ms_authorities[n]->DoIsHoliday(dt) )
+        {
+            return TRUE;

         }
         }

+    }
+
+    return FALSE;
+}

 
 

-        str += ch;
+/* static */
+size_t
+wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart,
+                                               const wxDateTime& dtEnd,
+                                               wxDateTimeArray& holidays)
+{
+    wxDateTimeArray hol;
+
+    holidays.Empty();
+
+    size_t count = ms_authorities.GetCount();
+    for ( size_t nAuth = 0; nAuth < count; nAuth++ )
+    {
+        ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
+
+        WX_APPEND_ARRAY(holidays, hol);

     }
 
     }
 

-    return str;
+    holidays.Sort(wxDateTimeCompareFunc);
+
+    return holidays.GetCount();
+}
+
+/* static */
+void wxDateTimeHolidayAuthority::ClearAllAuthorities()
+{
+    WX_CLEAR_ARRAY(ms_authorities);

 }
 }

+
+/* static */
+void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
+{
+    ms_authorities.Add(auth);
+}
+
+// ----------------------------------------------------------------------------
+// wxDateTimeWorkDays
+// ----------------------------------------------------------------------------
+
+bool wxDateTimeWorkDays::DoIsHoliday(const wxDateTime& dt) const
+{
+    wxDateTime::WeekDay wd = dt.GetWeekDay();
+
+    return (wd == wxDateTime::Sun) || (wd == wxDateTime::Sat);
+}
+
+size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
+                                                const wxDateTime& dtEnd,
+                                                wxDateTimeArray& holidays) const
+{
+    if ( dtStart > dtEnd )
+    {
+        wxFAIL_MSG( _T("invalid date range in GetHolidaysInRange") );
+
+        return 0u;
+    }
+
+    holidays.Empty();
+
+    // instead of checking all days, start with the first Sat after dtStart and
+    // end with the last Sun before dtEnd
+    wxDateTime dtSatFirst = dtStart.GetNextWeekDay(wxDateTime::Sat),
+               dtSatLast = dtEnd.GetPrevWeekDay(wxDateTime::Sat),
+               dtSunFirst = dtStart.GetNextWeekDay(wxDateTime::Sun),
+               dtSunLast = dtEnd.GetPrevWeekDay(wxDateTime::Sun),
+               dt;
+
+    for ( dt = dtSatFirst; dt <= dtSatLast; dt += wxDateSpan::Week() )
+    {
+        holidays.Add(dt);
+    }
+
+    for ( dt = dtSunFirst; dt <= dtSunLast; dt += wxDateSpan::Week() )
+    {
+        holidays.Add(dt);
+    }
+
+    return holidays.GetCount();
+}
+
+#endif // wxUSE_DATETIME