]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/datetime.cpp
1. a couple of compilation warnings fixed (strconv/listctrl)
[wxWidgets.git] / src / common / datetime.cpp
index 93682aaca7346b257670cbf6a664ef37204b4d18..5c212e190e7cc8fbd42c23a7ccc8061a0fa990ef 100644 (file)
 
 #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
 #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;
     #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
 
+// ----------------------------------------------------------------------------
+// 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
 // ----------------------------------------------------------------------------
@@ -137,19 +170,41 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------
-// globals
+// global data
+// ----------------------------------------------------------------------------
+
+static wxDateTime gs_dtDefault;
+
+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)
@@ -336,13 +391,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 +423,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 +476,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 +486,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 +872,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;
@@ -833,7 +888,8 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country)
 
         dt += wxTimeSpan::Hours(1);
 
 
         dt += wxTimeSpan::Hours(1);
 
-        dt.MakeGMT();
+        // disable DST tests because it could result in an infinite recursion!
+        dt.MakeGMT(TRUE);
     }
     else switch ( country )
     {
     }
     else switch ( country )
     {
@@ -917,7 +973,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;
@@ -933,7 +989,8 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
 
         dt += wxTimeSpan::Hours(1);
 
 
         dt += wxTimeSpan::Hours(1);
 
-        dt.MakeGMT();
+        // disable DST tests because it could result in an infinite recursion!
+        dt.MakeGMT(TRUE);
     }
     else switch ( country )
     {
     }
     else switch ( country )
     {
@@ -980,6 +1037,12 @@ 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)
 {
@@ -1008,7 +1071,7 @@ wxDateTime& wxDateTime::Set(const struct tm& tm)
 
         wxFAIL_MSG( _T("mktime() failed") );
 
 
         wxFAIL_MSG( _T("mktime() failed") );
 
-        return ms_InvDateTime;
+        return wxInvalidDateTime;
     }
     else
     {
     }
     else
     {
@@ -1026,14 +1089,13 @@ wxDateTime& wxDateTime::Set(wxDateTime_t hour,
     // 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,
     // 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,
+                 wxInvalidDateTime,
                  _T("Invalid time in wxDateTime::Set()") );
 
     // get the current date from system
                  _T("Invalid time in wxDateTime::Set()") );
 
     // 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") );
+    wxCHECK_MSG( tm, wxInvalidDateTime, _T("localtime() failed") );
 
     // adjust the time
     tm->tm_hour = hour;
 
     // adjust the time
     tm->tm_hour = hour;
@@ -1057,13 +1119,13 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
     wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
 
     wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000,
     wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
 
     wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000,
-                 ms_InvDateTime,
+                 wxInvalidDateTime,
                  _T("Invalid time in wxDateTime::Set()") );
 
     ReplaceDefaultYearMonthWithCurrent(&year, &month);
 
     wxCHECK_MSG( (0 < day) && (day <= GetNumberOfDays(month, year)),
                  _T("Invalid time in wxDateTime::Set()") );
 
     ReplaceDefaultYearMonthWithCurrent(&year, &month);
 
     wxCHECK_MSG( (0 < day) && (day <= GetNumberOfDays(month, year)),
-                 ms_InvDateTime,
+                 wxInvalidDateTime,
                  _T("Invalid date in wxDateTime::Set()") );
 
     // the range of time_t type (inclusive)
                  _T("Invalid date in wxDateTime::Set()") );
 
     // the range of time_t type (inclusive)
@@ -1120,15 +1182,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();
@@ -1142,16 +1218,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();
+#ifdef __VMS__ // 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);
@@ -1167,7 +1243,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
     }
@@ -1199,18 +1279,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 )
@@ -1237,18 +1317,18 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
     tm.year = (int)year;
     tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0
     tm.mday = (wxDateTime_t)day;
     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;
 }
@@ -1340,10 +1420,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;
 }
 
@@ -1351,18 +1448,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") );
+    wxCHECK_MSG( weekday != Inv_WeekDay, wxInvalidDateTime, _T("invalid weekday") );
 
     WeekDay wdayThis = GetWeekDay();
     if ( weekday == wdayThis )
 
     WeekDay wdayThis = GetWeekDay();
     if ( weekday == wdayThis )
@@ -1372,17 +1489,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") );
+    wxCHECK_MSG( weekday != Inv_WeekDay, wxInvalidDateTime, _T("invalid weekday") );
 
     int diff;
     WeekDay wdayThis = GetWeekDay();
 
     int diff;
     WeekDay wdayThis = GetWeekDay();
@@ -1401,12 +1518,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") );
+    wxCHECK_MSG( weekday != Inv_WeekDay, wxInvalidDateTime, _T("invalid weekday") );
 
     int diff;
     WeekDay wdayThis = GetWeekDay();
 
     int diff;
     WeekDay wdayThis = GetWeekDay();
@@ -1425,7 +1542,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,
@@ -1503,56 +1620,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 0
-    // 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 // this seems to be a bit simpler and I believe is also correct
-    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();
     wxCHECK_MSG( (0 < yday) && (yday <= GetNumberOfDays(year)),
 }
 
 wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
 {
     int year = GetYear();
     wxCHECK_MSG( (0 < yday) && (yday <= GetNumberOfDays(year)),
-                 ms_InvDateTime, _T("invalid year day") );
+                 wxInvalidDateTime, _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) )
@@ -1628,18 +1748,19 @@ int wxDateTime::IsDST(wxDateTime::Country country) const
     }
 }
 
     }
 }
 
-wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz)
+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
-    if ( IsDST() == 1 )
+    // we need to know whether DST is or not in effect for this date unless
+    // the test disabled by the caller
+    if ( !noDST && (IsDST() == 1) )
     {
         // FIXME we assume that the DST is always shifted by 1 hour
         secDiff -= 3600;
     }
 
     {
         // FIXME we assume that the DST is always shifted by 1 hour
         secDiff -= 3600;
     }
 
-    return Substract(wxTimeSpan::Seconds(secDiff));
+    return Subtract(wxTimeSpan::Seconds(secDiff));
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -1648,13 +1769,12 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz)
 
 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;
@@ -1668,10 +1788,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;
+#ifdef __VMS__ // time is unsigned so avoid the warning
+            int time2 = (int) time;
             if ( time2 >= 0 )
 #else
             if ( time >= 0 )
             if ( time2 >= 0 )
 #else
             if ( time >= 0 )
@@ -1696,7 +1816,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
@@ -1730,6 +1851,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;
 
@@ -1741,260 +1863,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;
+            }
         }
     }
 
         }
     }
 
@@ -2291,7 +2421,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);
-    MakeTimezone(60*(wxDateTime_t)offset);
+    MakeTimezone((wxDateTime_t)(60*offset));
 
     return p;
 }
 
     return p;
 }
@@ -2359,7 +2489,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'):
@@ -2395,7 +2535,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
 
                     // this is the format which corresponds to ctime() output
                     // and strptime("%c") should parse it, so try it first
 
                     // this is the format which corresponds to ctime() output
                     // and strptime("%c") should parse it, so try it first
-                    static const wxChar *fmtCtime = _T("%a %b %e %H:%M:%S %Y");
+                    static const wxChar *fmtCtime = _T("%a %b %d %H:%M:%S %Y");
 
                     const wxChar *result = dt.ParseFormat(input, fmtCtime);
                     if ( !result )
 
                     const wxChar *result = dt.ParseFormat(input, fmtCtime);
                     if ( !result )
@@ -2432,7 +2572,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;
@@ -2445,7 +2586,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;
@@ -2456,7 +2597,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;
@@ -2464,11 +2605,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;
@@ -2479,7 +2620,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;
@@ -2490,7 +2631,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;
@@ -2554,7 +2695,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;
@@ -2584,7 +2725,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;
@@ -2621,18 +2762,27 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 {
                     wxDateTime dt;
 
                 {
                     wxDateTime dt;
 
-                    wxString fmtDate;
+                    wxString fmtDate, fmtDateAlt;
                     if ( IsWestEuropeanCountry(GetCountry()) ||
                          GetCountry() == Russia )
                     {
                         fmtDate = _T("%d/%m/%y");
                     if ( IsWestEuropeanCountry(GetCountry()) ||
                          GetCountry() == Russia )
                     {
                         fmtDate = _T("%d/%m/%y");
+                        fmtDateAlt = _T("%m/%d/%y");
                     }
                     else // assume USA
                     {
                         fmtDate = _T("%m/%d/%y");
                     }
                     else // assume USA
                     {
                         fmtDate = _T("%m/%d/%y");
+                        fmtDateAlt = _T("%d/%m/%y");
                     }
 
                     const wxChar *result = dt.ParseFormat(input, fmtDate);
                     }
 
                     const wxChar *result = dt.ParseFormat(input, fmtDate);
+
+                    if ( !result )
+                    {
+                        // ok, be nice and try another one
+                        result = dt.ParseFormat(input, fmtDateAlt);
+                    }
+
                     if ( !result )
                     {
                         // bad luck
                     if ( !result )
                     {
                         // bad luck
@@ -2704,18 +2854,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;
@@ -2754,7 +2907,11 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
         // take this date as default
         tmDef = dateDef.GetTm();
     }
         // take this date as default
         tmDef = dateDef.GetTm();
     }
+#ifdef __WIN16__
     else if ( m_time != 0 )
     else if ( m_time != 0 )
+#else
+    else if ( m_time != wxLongLong(0) )
+#endif
     {
         // if this date is valid, don't change it
         tmDef = GetTm();
     {
         // if this date is valid, don't change it
         tmDef = GetTm();
@@ -2855,18 +3012,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
+    {
+        const wxChar *str;
+        int dayDiffFromToday;
+    } literalDates[] =
     {
     {
-        // nothing can follow this, so stop here
-        p += len;
+        { 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;
+
+            int dayDiffFromToday = literalDates[n].dayDiffFromToday;
+            *this = Today();
+            if ( dayDiffFromToday )
+            {
+                *this += wxDateSpan::Days(dayDiffFromToday);
+            }
 
 
-        return p;
+            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?
@@ -2880,10 +3062,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;
@@ -2893,115 +3079,60 @@ 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 > maxDays) )
                 {
                 {
-                    // 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 )
@@ -3009,6 +3140,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                     break;
                 }
 
                     break;
                 }
 
+                mon = mon2;
+
                 haveMon = TRUE;
             }
             else
                 haveMon = TRUE;
             }
             else
@@ -3083,19 +3216,21 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                 }
             }
         }
                 }
             }
         }
+
+        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
@@ -3103,6 +3238,37 @@ 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 <= 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();
@@ -3123,6 +3289,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;
             }
         }
@@ -3134,8 +3302,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)
@@ -3209,6 +3385,15 @@ 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
 // ============================================================================
@@ -3234,48 +3419,48 @@ 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));
 
 
-    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;
 
         {
             wxString tmp;
 
-            ch = *pch++;
+            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 '%':
+                case _T('%'):
                     // will get to str << ch below
                     break;
 
                     // will get to str << ch below
                     break;
 
-                case 'D':
+                case _T('D'):
                     tmp.Printf(_T("%d"), GetDays());
                     break;
 
                     tmp.Printf(_T("%d"), GetDays());
                     break;
 
-                case 'E':
+                case _T('E'):
                     tmp.Printf(_T("%d"), GetWeeks());
                     break;
 
                     tmp.Printf(_T("%d"), GetWeeks());
                     break;
 
-                case 'H':
+                case _T('H'):
                     tmp.Printf(_T("%02d"), GetHours());
                     break;
 
                     tmp.Printf(_T("%02d"), GetHours());
                     break;
 
-                case 'l':
+                case _T('l'):
                     tmp.Printf(_T("%03ld"), GetMilliseconds().ToLong());
                     break;
 
                     tmp.Printf(_T("%03ld"), GetMilliseconds().ToLong());
                     break;
 
-                case 'M':
+                case _T('M'):
                     tmp.Printf(_T("%02d"), GetMinutes());
                     break;
 
                     tmp.Printf(_T("%02d"), GetMinutes());
                     break;
 
-                case 'S':
+                case _T('S'):
                     tmp.Printf(_T("%02ld"), GetSeconds().ToLong());
                     break;
             }
                     tmp.Printf(_T("%02ld"), GetSeconds().ToLong());
                     break;
             }
@@ -3294,3 +3479,123 @@ wxString wxTimeSpan::Format(const wxChar *format) const
 
     return str;
 }
 
     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;
+}
+
+/* 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);
+    }
+
+    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();
+}
+
+