]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/datetime.cpp
moved wxDash typedef to gdicmn.h
[wxWidgets.git] / src / common / datetime.cpp
index 63e797a4290f637f861547202b8c5ca265385b7b..11c5c78824a208d8c2b94f36ffd2e689f6940a94 100644 (file)
 
 #include "wx/thread.h"
 #include "wx/tokenzr.h"
+#include "wx/module.h"
 
-#define wxDEFINE_TIME_CONSTANTS
+#define wxDEFINE_TIME_CONSTANTS // before including datetime.h
+
+#include <ctype.h>
 
 #include "wx/datetime.h"
 
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+#if defined(HAVE_STRPTIME) && defined(__LINUX__)
+    // glibc 2.0.7 strptime() is broken - the following snippet causes it to
+    // crash (instead of just failing):
+    //
+    //      strncpy(buf, "Tue Dec 21 20:25:40 1999", 128);
+    //      strptime(buf, "%x", &tm);
+    //
+    // so don't use it
+    #undef HAVE_STRPTIME
+#endif // broken strptime()
+
 #ifndef WX_TIMEZONE
-    #define WX_TIMEZONE timezone
-#endif
+    #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
 
-// Is this right? Just a guess. (JACS)
-#ifdef __MINGW32__
-#define timezone _timezone
-#endif
+// ----------------------------------------------------------------------------
+// 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
@@ -114,26 +160,50 @@ static const long DAYS_PER_5_MONTHS  = 153l;
 static const long DAYS_PER_4_YEARS   = 1461l;
 static const long DAYS_PER_400_YEARS = 146097l;
 
+// this array contains the cumulated number of days in all previous months for
+// normal and leap years
+static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
+{
+    { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 },
+    { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }
+};
+
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+static wxDateTime gs_dtDefault;
+
+wxDateTime& wxDefaultDateTime = gs_dtDefault;
+
+wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
+
 // ----------------------------------------------------------------------------
-// globals
+// private globals
 // ----------------------------------------------------------------------------
 
 // 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
 
-// the symbolic names for date spans
-wxDateSpan wxYear  = wxDateSpan(1, 0, 0, 0);
-wxDateSpan wxMonth = wxDateSpan(0, 1, 0, 0);
-wxDateSpan wxWeek  = wxDateSpan(0, 0, 1, 0);
-wxDateSpan wxDay   = wxDateSpan(0, 0, 0, 1);
-
 // ----------------------------------------------------------------------------
 // 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)
@@ -245,20 +315,45 @@ static void ReplaceDefaultYearMonthWithCurrent(int *year,
     }
 }
 
+// fll the struct tm with default values
+static void InitTm(struct tm& tm)
+{
+    // struct tm may have etxra fields (undocumented and with unportable
+    // names) which, nevertheless, must be set to 0
+    memset(&tm, 0, sizeof(struct tm));
+
+    tm.tm_mday = 1;   // mday 0 is invalid
+    tm.tm_year = 76;  // any valid year
+    tm.tm_isdst = -1; // auto determine
+}
+
 // parsing helpers
 // ---------------
 
 // return the month if the string is a month name or Inv_Month otherwise
-static wxDateTime::Month GetMonthFromName(const wxString& name)
+static wxDateTime::Month GetMonthFromName(const wxString& name, int flags)
 {
     wxDateTime::Month mon;
     for ( mon = wxDateTime::Jan; mon < wxDateTime::Inv_Month; wxNextMonth(mon) )
     {
-        // case-insensitive comparison with both abbreviated and not versions
-        if ( name.CmpNoCase(wxDateTime::GetMonthName(mon, TRUE)) ||
-             name.CmpNoCase(wxDateTime::GetMonthName(mon, FALSE)) )
+        // case-insensitive comparison either one of or with both abbreviated
+        // and not versions
+        if ( flags & wxDateTime::Name_Full )
         {
-            break;
+            if ( name.CmpNoCase(wxDateTime::
+                        GetMonthName(mon, wxDateTime::Name_Full)) == 0 )
+            {
+                break;
+            }
+        }
+
+        if ( flags & wxDateTime::Name_Abbr )
+        {
+            if ( name.CmpNoCase(wxDateTime::
+                        GetMonthName(mon, wxDateTime::Name_Abbr)) == 0 )
+            {
+                break;
+            }
         }
     }
 
@@ -266,33 +361,63 @@ static wxDateTime::Month GetMonthFromName(const wxString& name)
 }
 
 // return the weekday if the string is a weekday name or Inv_WeekDay otherwise
-static wxDateTime::WeekDay GetWeekDayFromName(const wxString& name)
+static wxDateTime::WeekDay GetWeekDayFromName(const wxString& name, int flags)
 {
     wxDateTime::WeekDay wd;
     for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
     {
-        // case-insensitive comparison with both abbreviated and not versions
-        if ( name.IsSameAs(wxDateTime::GetWeekDayName(wd, TRUE), FALSE) ||
-             name.IsSameAs(wxDateTime::GetWeekDayName(wd, FALSE), FALSE) )
+        // case-insensitive comparison either one of or with both abbreviated
+        // and not versions
+        if ( flags & wxDateTime::Name_Full )
         {
-            break;
+            if ( name.CmpNoCase(wxDateTime::
+                        GetWeekDayName(wd, wxDateTime::Name_Full)) == 0 )
+            {
+                break;
+            }
+        }
+
+        if ( flags & wxDateTime::Name_Abbr )
+        {
+            if ( name.CmpNoCase(wxDateTime::
+                        GetWeekDayName(wd, wxDateTime::Name_Abbr)) == 0 )
+            {
+                break;
+            }
         }
     }
 
     return wd;
 }
 
+// scans all digits and returns the resulting number
+static bool GetNumericToken(const wxChar*& p, unsigned long *number)
+{
+    wxString s;
+    while ( wxIsdigit(*p) )
+    {
+        s += *p++;
+    }
+
+    return !!s && s.ToULong(number);
+}
+
+// scans all alphabetic characters and returns the resulting string
+static wxString GetAlphaToken(const wxChar*& p)
+{
+    wxString s;
+    while ( wxIsalpha(*p) )
+    {
+        s += *p++;
+    }
+
+    return s;
+}
+
 // ============================================================================
 // implementation of wxDateTime
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// static data
-// ----------------------------------------------------------------------------
-
-wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
-wxDateTime wxDateTime::ms_InvDateTime;
-
 // ----------------------------------------------------------------------------
 // struct Tm
 // ----------------------------------------------------------------------------
@@ -346,7 +471,7 @@ void wxDateTime::Tm::AddMonths(int monDiff)
         monDiff += MONTHS_IN_YEAR;
     }
 
-    while ( monDiff + mon > MONTHS_IN_YEAR )
+    while ( monDiff + mon >= MONTHS_IN_YEAR )
     {
         year++;
 
@@ -356,19 +481,22 @@ void wxDateTime::Tm::AddMonths(int monDiff)
     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
-    mday += dayDiff;
-    while ( mday < 1 )
+    while ( dayDiff + mday < 1 )
     {
         AddMonths(-1);
 
-        mday += GetNumOfDaysInMonth(year, mon);
+        dayDiff += GetNumOfDaysInMonth(year, mon);
     }
 
+    mday += dayDiff;
     while ( mday > GetNumOfDaysInMonth(year, mon) )
     {
         mday -= GetNumOfDaysInMonth(year, mon);
@@ -506,7 +634,6 @@ wxDateTime::Month wxDateTime::GetCurrentMonth(wxDateTime::Calendar cal)
     {
         case Gregorian:
             return Now().GetMonth();
-            break;
 
         case Julian:
             wxFAIL_MSG(_T("TODO"));
@@ -534,7 +661,6 @@ wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(int year, Calendar cal)
         case Gregorian:
         case Julian:
             return IsLeapYear(year) ? 366 : 365;
-            break;
 
         default:
             wxFAIL_MSG(_T("unsupported calendar"));
@@ -570,33 +696,32 @@ wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(wxDateTime::Month month,
 }
 
 /* static */
-wxString wxDateTime::GetMonthName(wxDateTime::Month month, bool abbr)
+wxString wxDateTime::GetMonthName(wxDateTime::Month month,
+                                  wxDateTime::NameFlags flags)
 {
     wxCHECK_MSG( month != Inv_Month, _T(""), _T("invalid month") );
 
     // notice that we must set all the fields to avoid confusing libc (GNU one
     // gets confused to a crash if we don't do this)
     tm tm;
-    tm.tm_hour =
-    tm.tm_min =
-    tm.tm_sec =
-    tm.tm_wday =
-    tm.tm_yday = 0;
-    tm.tm_mday = 1;
+    InitTm(tm);
     tm.tm_mon = month;
-    tm.tm_year = 76;  // any year will do
-    tm.tm_isdst = -1;
 
-    return CallStrftime(abbr ? _T("%b") : _T("%B"), &tm);
+    return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &tm);
 }
 
 /* static */
-wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday, bool abbr)
+wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
+                                    wxDateTime::NameFlags flags)
 {
     wxCHECK_MSG( wday != Inv_WeekDay, _T(""), _T("invalid weekday") );
 
     // take some arbitrary Sunday
-    tm tm = { 0, 0, 0, 28, Nov, 99 };
+    tm tm;
+    InitTm(tm);
+    tm.tm_mday = 28;
+    tm.tm_mon = Nov;
+    tm.tm_year = 99;
 
     // and offset it by the number of days needed to get the correct wday
     tm.tm_mday += wday;
@@ -605,7 +730,23 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday, bool abbr)
     (void)mktime(&tm);
 
     // ... and call strftime()
-    return CallStrftime(abbr ? _T("%a") : _T("%A"), &tm);
+    return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm);
+}
+
+/* static */
+void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
+{
+    tm tm;
+    InitTm(tm);
+    if ( am )
+    {
+        *am = CallStrftime(_T("%p"), &tm);
+    }
+    if ( pm )
+    {
+        tm.tm_hour = 13;
+        *pm = CallStrftime(_T("%p"), &tm);
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -616,6 +757,8 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday, bool abbr)
 /* static */
 wxDateTime::Country wxDateTime::GetCountry()
 {
+    // TODO use LOCALE_ICOUNTRY setting under Win32
+
     if ( ms_country == Country_Unknown )
     {
         // try to guess from the time zone name
@@ -724,7 +867,7 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country)
 
     if ( !IsDSTApplicable(year, country) )
     {
-        return ms_InvDateTime;
+        return wxInvalidDateTime;
     }
 
     wxDateTime dt;
@@ -740,7 +883,8 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country)
 
         dt += wxTimeSpan::Hours(1);
 
-        dt.MakeGMT();
+        // disable DST tests because it could result in an infinite recursion!
+        dt.MakeGMT(TRUE);
     }
     else switch ( country )
     {
@@ -824,14 +968,14 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
 
     if ( !IsDSTApplicable(year, country) )
     {
-        return ms_InvDateTime;
+        return wxInvalidDateTime;
     }
 
     wxDateTime dt;
 
     if ( IsWestEuropeanCountry(country) || (country == Russia) )
     {
-        // DST ends at 1 a.m. GMT on the last Sunday of October 
+        // DST ends at 1 a.m. GMT on the last Sunday of October
         if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
         {
             // weirder and weirder...
@@ -840,7 +984,8 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
 
         dt += wxTimeSpan::Hours(1);
 
-        dt.MakeGMT();
+        // disable DST tests because it could result in an infinite recursion!
+        dt.MakeGMT(TRUE);
     }
     else switch ( country )
     {
@@ -862,7 +1007,7 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
                     break;
 
                 default:
-                    // DST ends at 2 a.m. on the last Sunday of October 
+                    // DST ends at 2 a.m. on the last Sunday of October
                     if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
                     {
                         // weirder and weirder...
@@ -915,7 +1060,7 @@ wxDateTime& wxDateTime::Set(const struct tm& tm)
 
         wxFAIL_MSG( _T("mktime() failed") );
 
-        return ms_InvDateTime;
+        return wxInvalidDateTime;
     }
     else
     {
@@ -933,14 +1078,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,
-                 ms_InvDateTime,
+                 wxInvalidDateTime,
                  _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;
@@ -964,13 +1108,13 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
     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)),
-                 ms_InvDateTime,
+                 wxInvalidDateTime,
                  _T("Invalid date in wxDateTime::Set()") );
 
     // the range of time_t type (inclusive)
@@ -1022,7 +1166,24 @@ wxDateTime& wxDateTime::Set(double jdn)
 
     jdn *= MILLISECONDS_PER_DAY;
 
-    m_time = jdn;
+    m_time.Assign(jdn);
+
+    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;
 }
@@ -1050,8 +1211,13 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
         }
         else
         {
-            time += tz.GetOffset();
+            time += (time_t)tz.GetOffset();
+#ifdef __VMS__ // time is unsigned so avoid warning
+            int time2 = (int) time;
+            if ( time2 >= 0 )
+#else
             if ( time >= 0 )
+#endif
             {
                 tm = gmtime(&time);
 
@@ -1098,18 +1264,18 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
     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;
-    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;
-    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 )
@@ -1136,18 +1302,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.msec = timeOnly % 1000;
+    tm.msec = (wxDateTime_t)(timeOnly % 1000);
     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
 
-    tm.min = timeOnly % 60;
+    tm.min = (wxDateTime_t)(timeOnly % 60);
     timeOnly -= tm.min;
 
-    tm.hour = timeOnly / 60;
+    tm.hour = (wxDateTime_t)(timeOnly / 60);
 
     return tm;
 }
@@ -1239,10 +1405,27 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
 
     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);
 
+    wxASSERT_MSG( IsSameTime(tm),
+                  _T("Add(wxDateSpan) shouldn't modify time") );
+
     return *this;
 }
 
@@ -1250,18 +1433,38 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
 // 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
-    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)
 {
-    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 )
@@ -1271,17 +1474,17 @@ wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday)
     }
     else if ( weekday < wdayThis )
     {
-        return Substract(wxTimeSpan::Days(wdayThis - weekday));
+        return Substract(wxDateSpan::Days(wdayThis - weekday));
     }
     else // weekday > wdayThis
     {
-        return Add(wxTimeSpan::Days(weekday - wdayThis));
+        return Add(wxDateSpan::Days(weekday - wdayThis));
     }
 }
 
 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();
@@ -1300,12 +1503,12 @@ wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
         diff = weekday - wdayThis;
     }
 
-    return Add(wxTimeSpan::Days(diff));
+    return Add(wxDateSpan::Days(diff));
 }
 
 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();
@@ -1324,7 +1527,7 @@ wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
         diff = wdayThis - weekday;
     }
 
-    return Substract(wxTimeSpan::Days(diff));
+    return Substract(wxDateSpan::Days(diff));
 }
 
 bool wxDateTime::SetToWeekDay(WeekDay weekday,
@@ -1397,62 +1600,80 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday,
 
 wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
 {
-    // this array contains the cumulated number of days in all previous months
-    // for normal and leap years
-    static const wxDateTime_t cumulatedDays[2][MONTHS_IN_YEAR] =
-    {
-        { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 },
-        { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }
-    };
-
     Tm tm(GetTm(tz));
 
-    return 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 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;
-#else // this seems to be a bit simpler and I believe is also correct
-    return (WeekDay)((GetDayOfYear() - (GetWeekDay() - 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
+{
+    Tm tm = GetTm(tz);
+    wxDateTime dtMonthStart = wxDateTime(1, tm.mon, tm.year);
+    int nWeek = GetWeekOfYear(flags) - dtMonthStart.GetWeekOfYear(flags) + 1;
+    if ( nWeek < 0 )
+    {
+        // this may happen for January when Jan, 1 is the last week of the
+        // previous year
+        nWeek += IsLeapYear(tm.year - 1) ? 53 : 52;
+    }
+
+    return (wxDateTime::wxDateTime_t)nWeek;
+}
+
+wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
 {
-    size_t nWeek = 0;
+    int year = GetYear();
+    wxCHECK_MSG( (0 < yday) && (yday <= GetNumberOfDays(year)),
+                 wxInvalidDateTime, _T("invalid year day") );
 
-    wxDateTime dt(*this);
-    do
+    bool isLeap = IsLeapYear(year);
+    for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) )
     {
-        nWeek++;
+        // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
+        // don't need it neither - because of the CHECK above we know that
+        // yday lies in December then
+        if ( (mon == Dec) || (yday < gs_cumulatedDays[isLeap][mon + 1]) )
+        {
+            Set(yday - gs_cumulatedDays[isLeap][mon], mon, year);
 
-        dt -= wxTimeSpan::Week();
+            break;
+        }
     }
-    while ( dt.GetMonth(tz) == GetMonth(tz) );
 
-    return nWeek;
+    return *this;
 }
 
 // ----------------------------------------------------------------------------
@@ -1512,12 +1733,13 @@ 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;
@@ -1549,9 +1771,14 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
         }
         else
         {
-            time += tz.GetOffset();
+            time += (int)tz.GetOffset();
 
+#ifdef __VMS__ // time is unsigned so avoid the warning
+            int time2 = (int) time;
+            if ( time2 >= 0 )
+#else
             if ( time >= 0 )
+#endif
             {
                 tm = gmtime(&time);
 
@@ -1587,7 +1814,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
     tmTimeOnly.tm_year = 76;
     tmTimeOnly.tm_isdst = 0;        // no DST, we adjust for tz ourselves
 
-    wxString tmp, res;
+    wxString tmp, res, fmt;
     for ( const wxChar *p = format; *p; p++ )
     {
         if ( *p != _T('%') )
@@ -1598,249 +1825,283 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
             continue;
         }
 
-        // start of the format specification
+        // set the default format
         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'));
+            case _T('Y'):               // year has 4 digits
+                fmt = _T("%04d");
                 break;
 
-            case _T('b'):       // a month name
-            case _T('B'):
-                // second parameter should be TRUE for abbreviated names
-                res += GetMonthName(tm.mon, *p == _T('b'));
+            case _T('j'):               // day of year has 3 digits
+                fmt = _T("%03d");
                 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
-                    {
-                        year = 1970 + mod28 - 10; // 1970 == 10 (mod 28)
-                    }
+            default:
+                // it's either another valid format specifier in which case
+                // the format is "%02d" (for all the rest) or we have the
+                // field width preceding the format in which case it will
+                // override the default format anyhow
+                fmt = _T("%02d");
+        }
 
-                    int nCentury = year / 100,
-                        nCenturyReal = yearReal / 100;
+        bool restart = TRUE;
+        while ( restart )
+        {
+            restart = FALSE;
+
+            // 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;
 
-                    // 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);
+                case _T('b'):       // a month name
+                case _T('B'):
+                    res += GetMonthName(tm.mon,
+                                        *p == _T('b') ? Name_Abbr : Name_Full);
+                    break;
 
-                    // 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 )
+                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!
                     {
-                        nLostWeekDays += year++ % 4 ? 1 : 2;
-                    }
+                        // 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)
+                        }
 
-                    // at any rate, we couldn't go further than 1988 + 9 + 28!
-                    wxASSERT_MSG( year < 2030,
-                                  _T("logic error in wxDateTime::Format") );
+                        int nCentury = year / 100,
+                            nCenturyReal = yearReal / 100;
 
-                    wxString strYear, strYear2;
-                    strYear.Printf(_T("%d"), year);
-                    strYear2.Printf(_T("%d"), year % 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);
 
-                    // 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;
-                    }
+                        // 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;
+                        }
 
-                    wxString replacement2 = (wxChar)-2;
-                    while ( fmt.Find(replacement) != wxNOT_FOUND )
-                    {
-                        replacement << (wxChar)-2;
+                        // 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);
+
+                        // 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;
+                        }
+
+                        // 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);
+                        }
+
+                        res += str;
                     }
+                    break;
 
-                    // replace all occurences of year with it
-                    bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
-                    if ( !wasReplaced )
-                        wasReplaced = fmt.Replace(strYear2, replacement2) > 0;
+                case _T('d'):       // day of a month (01-31)
+                    res += wxString::Format(fmt, tm.mday);
+                    break;
 
-                    // 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;
-                    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 )
+                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)
                     {
-                        str.Replace(replacement2, strYear2);
-                        str.Replace(replacement, strYear);
+                        // 24h -> 12h, 0h -> 12h too
+                        int hour12 = tm.hour > 12 ? tm.hour - 12
+                                                  : tm.hour ? tm.hour : 12;
+                        res += wxString::Format(fmt, hour12);
                     }
+                    break;
 
-                    res += str;
-                }
-                break;
+                case _T('j'):       // day of the year
+                    res += wxString::Format(fmt, GetDayOfYear(tz));
+                    break;
 
-            case _T('d'):       // day of a month (01-31)
-                tmp.Printf(_T("%02d"), tm.mday);
-                res += tmp;
-                break;
+                case _T('m'):       // month as a number (01-12)
+                    res += wxString::Format(fmt, tm.mon + 1);
+                    break;
 
-            case _T('H'):       // hour in 24h format (00-23)
-                tmp.Printf(_T("%02d"), tm.hour);
-                res += tmp;
-                break;
+                case _T('M'):       // minute as a decimal number (00-59)
+                    res += wxString::Format(fmt, tm.min);
+                    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;
-                    tmp.Printf(_T("%02d"), hour12);
-                    res += tmp;
-                }
-                break;
+                case _T('p'):       // AM or PM string
+                    res += CallStrftime(_T("%p"), &tmTimeOnly);
+                    break;
 
-            case _T('j'):       // day of the year
-                tmp.Printf(_T("%03d"), GetDayOfYear(tz));
-                res += tmp;
-                break;
+                case _T('S'):       // second as a decimal number (00-61)
+                    res += wxString::Format(fmt, tm.sec);
+                    break;
 
-            case _T('m'):       // month as a number (01-12)
-                tmp.Printf(_T("%02d"), tm.mon + 1);
-                res += tmp;
-                break;
+                case _T('U'):       // week number in the year (Sunday 1st week day)
+                    res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
+                    break;
 
-            case _T('M'):       // minute as a decimal number (00-59)
-                tmp.Printf(_T("%02d"), tm.min);
-                res += tmp;
-                break;
+                case _T('W'):       // week number in the year (Monday 1st week day)
+                    res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz));
+                    break;
 
-            case _T('p'):       // AM or PM string
-                res += CallStrftime(_T("%p"), &tmTimeOnly);
-                break;
+                case _T('w'):       // weekday as a number (0-6), Sunday = 0
+                    res += wxString::Format(fmt, tm.GetWeekDay());
+                    break;
 
-            case _T('S'):       // second as a decimal number (00-61)
-                tmp.Printf(_T("%02d"), tm.sec);
-                res += tmp;
-                break;
+                // case _T('x'): -- handled with "%c"
 
-            case _T('U'):       // week number in the year (Sunday 1st week day)
-                tmp.Printf(_T("%02d"),
-                           (GetDayOfYear(tz) - tm.GetWeekDay() + 7) / 7);
-                res += tmp;
-                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('W'):       // week number in the year (Monday 1st week day)
-                tmp.Printf(_T("%02d"), GetWeekOfYear(tz));
-                res += tmp;
-                break;
+                case _T('y'):       // year without century (00-99)
+                    res += wxString::Format(fmt, tm.year % 100);
+                    break;
 
-            case _T('w'):       // weekday as a number (0-6), Sunday = 0
-                tmp.Printf(_T("%d"), tm.GetWeekDay());
-                res += tmp;
-                break;
+                case _T('Y'):       // year with century
+                    res += wxString::Format(fmt, tm.year);
+                    break;
 
-            // case _T('x'): -- handled with "%c"
+                case _T('Z'):       // timezone name
+                    res += CallStrftime(_T("%Z"), &tmTimeOnly);
+                    break;
 
-            case _T('X'):       // locale default time representation
-                // just use strftime() to format the time for us
-                res += CallStrftime(_T("%X"), &tmTimeOnly);
-                break;
+                default:
+                    // is it the format width?
+                    fmt.Empty();
+                    while ( *p == _T('-') || *p == _T('+') ||
+                            *p == _T(' ') || wxIsdigit(*p) )
+                    {
+                        fmt += *p;
+                    }
 
-            case _T('y'):       // year without century (00-99)
-                tmp.Printf(_T("%02d"), tm.year % 100);
-                res += tmp;
-                break;
+                    if ( !fmt.IsEmpty() )
+                    {
+                        // we've only got the flags and width so far in fmt
+                        fmt.Prepend(_T('%'));
+                        fmt.Append(_T('d'));
 
-            case _T('Y'):       // year with century
-                tmp.Printf(_T("%04d"), tm.year);
-                res += tmp;
-                break;
+                        restart = TRUE;
 
-            case _T('Z'):       // timezone name
-                res += CallStrftime(_T("%Z"), &tmTimeOnly);
-                break;
+                        break;
+                    }
 
-            default:
-                wxFAIL_MSG(_T("unknown format specificator"));
+                    // no, it wasn't the width
+                    wxFAIL_MSG(_T("unknown format specificator"));
 
-                // fall through and just copy it nevertheless
+                    // fall through and just copy it nevertheless
 
-            case _T('%'):       // a percent sign
-                res += *p;
-                break;
+                case _T('%'):       // a percent sign
+                    res += *p;
+                    break;
 
-            case 0:
-                wxFAIL_MSG(_T("missing format at the end of string"));
+                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;
+                    // just put the '%' which was the last char in format
+                    res += _T('%');
+                    break;
+            }
         }
     }
 
@@ -2137,28 +2398,562 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
 
     // the spec was correct
     Set(day, mon, year, hour, min, sec);
-    MakeTimezone(60*offset);
+    MakeTimezone((wxDateTime_t)(60*offset));
 
     return p;
 }
 
-const wxChar *wxDateTime::ParseFormat(const wxChar *date, const wxChar *format)
+const wxChar *wxDateTime::ParseFormat(const wxChar *date,
+                                      const wxChar *format,
+                                      const wxDateTime& dateDef)
 {
     wxCHECK_MSG( date && format, (wxChar *)NULL,
-                 _T("NULL pointer in wxDateTime::Parse") );
+                 _T("NULL pointer in wxDateTime::ParseFormat()") );
 
-    // there is a public domain version of getdate.y, but it only works for
-    // English...
-    wxFAIL_MSG(_T("TODO"));
+    wxString str;
+    unsigned long num;
 
-    return (wxChar *)NULL;
-}
+    // what fields have we found?
+    bool haveWDay = FALSE,
+         haveYDay = FALSE,
+         haveDay = FALSE,
+         haveMon = FALSE,
+         haveYear = FALSE,
+         haveHour = FALSE,
+         haveMin = FALSE,
+         haveSec = FALSE;
 
-const wxChar *wxDateTime::ParseDateTime(const wxChar *date)
-{
+    bool hourIsIn12hFormat = FALSE, // or in 24h one?
+         isPM = FALSE;              // AM by default
+
+    // and the value of the items we have (init them to get rid of warnings)
+    wxDateTime_t sec = 0,
+                 min = 0,
+                 hour = 0;
+    WeekDay wday = Inv_WeekDay;
+    wxDateTime_t yday = 0,
+                 mday = 0;
+    wxDateTime::Month mon = Inv_Month;
+    int year = 0;
+
+    const wxChar *input = date;
+    for ( const wxChar *fmt = format; *fmt; fmt++ )
+    {
+        if ( *fmt != _T('%') )
+        {
+            if ( wxIsspace(*fmt) )
+            {
+                // a white space in the format string matches 0 or more white
+                // spaces in the input
+                while ( wxIsspace(*input) )
+                {
+                    input++;
+                }
+            }
+            else // !space
+            {
+                // any other character (not whitespace, not '%') must be
+                // matched by itself in the input
+                if ( *input++ != *fmt )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+            }
+
+            // done with this format char
+            continue;
+        }
+
+        // start of a format specification
+        switch ( *++fmt )
+        {
+            case _T('a'):       // a weekday name
+            case _T('A'):
+                {
+                    int flag = *fmt == _T('a') ? Name_Abbr : Name_Full;
+                    wday = GetWeekDayFromName(GetAlphaToken(input), flag);
+                    if ( wday == Inv_WeekDay )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+                }
+                haveWDay = TRUE;
+                break;
+
+            case _T('b'):       // a month name
+            case _T('B'):
+                {
+                    int flag = *fmt == _T('b') ? Name_Abbr : Name_Full;
+                    mon = GetMonthFromName(GetAlphaToken(input), flag);
+                    if ( mon == Inv_Month )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+                }
+                haveMon = TRUE;
+                break;
+
+            case _T('c'):       // locale default date and time  representation
+                {
+                    wxDateTime dt;
+
+                    // 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 %d %H:%M:%S %Y");
+
+                    const wxChar *result = dt.ParseFormat(input, fmtCtime);
+                    if ( !result )
+                    {
+                        result = dt.ParseFormat(input, _T("%x %X"));
+                    }
+
+                    if ( !result )
+                    {
+                        result = dt.ParseFormat(input, _T("%X %x"));
+                    }
+
+                    if ( !result )
+                    {
+                        // we've tried everything and still no match
+                        return (wxChar *)NULL;
+                    }
+
+                    Tm tm = dt.GetTm();
+
+                    haveDay = haveMon = haveYear =
+                    haveHour = haveMin = haveSec = TRUE;
+
+                    hour = tm.hour;
+                    min = tm.min;
+                    sec = tm.sec;
+
+                    year = tm.year;
+                    mon = tm.mon;
+                    mday = tm.mday;
+
+                    input = result;
+                }
+                break;
+
+            case _T('d'):       // day of a month (01-31)
+                if ( !GetNumericToken(input, &num) || (num > 31) || (num < 1) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                // we can't check whether the day range is correct yet, will
+                // do it later - assume ok for now
+                haveDay = TRUE;
+                mday = (wxDateTime_t)num;
+                break;
+
+            case _T('H'):       // hour in 24h format (00-23)
+                if ( !GetNumericToken(input, &num) || (num > 23) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveHour = TRUE;
+                hour = (wxDateTime_t)num;
+                break;
+
+            case _T('I'):       // hour in 12h format (01-12)
+                if ( !GetNumericToken(input, &num) || !num || (num > 12) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveHour = TRUE;
+                hourIsIn12hFormat = TRUE;
+                hour = (wxDateTime_t)(num % 12);        // 12 should be 0
+                break;
+
+            case _T('j'):       // day of the year
+                if ( !GetNumericToken(input, &num) || !num || (num > 366) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveYDay = TRUE;
+                yday = (wxDateTime_t)num;
+                break;
+
+            case _T('m'):       // month as a number (01-12)
+                if ( !GetNumericToken(input, &num) || !num || (num > 12) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveMon = TRUE;
+                mon = (Month)(num - 1);
+                break;
+
+            case _T('M'):       // minute as a decimal number (00-59)
+                if ( !GetNumericToken(input, &num) || (num > 59) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveMin = TRUE;
+                min = (wxDateTime_t)num;
+                break;
+
+            case _T('p'):       // AM or PM string
+                {
+                    wxString am, pm, token = GetAlphaToken(input);
+
+                    GetAmPmStrings(&am, &pm);
+                    if ( token.CmpNoCase(pm) == 0 )
+                    {
+                        isPM = TRUE;
+                    }
+                    else if ( token.CmpNoCase(am) != 0 )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+                }
+                break;
+
+            case _T('r'):       // time as %I:%M:%S %p
+                {
+                    wxDateTime dt;
+                    input = dt.ParseFormat(input, _T("%I:%M:%S %p"));
+                    if ( !input )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = haveSec = TRUE;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                    sec = tm.sec;
+                }
+                break;
+
+            case _T('R'):       // time as %H:%M
+                {
+                    wxDateTime dt;
+                    input = dt.ParseFormat(input, _T("%H:%M"));
+                    if ( !input )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = TRUE;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                }
+
+            case _T('S'):       // second as a decimal number (00-61)
+                if ( !GetNumericToken(input, &num) || (num > 61) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveSec = TRUE;
+                sec = (wxDateTime_t)num;
+                break;
+
+            case _T('T'):       // time as %H:%M:%S
+                {
+                    wxDateTime dt;
+                    input = dt.ParseFormat(input, _T("%H:%M:%S"));
+                    if ( !input )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = haveSec = TRUE;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                    sec = tm.sec;
+                }
+                break;
+
+            case _T('w'):       // weekday as a number (0-6), Sunday = 0
+                if ( !GetNumericToken(input, &num) || (wday > 6) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveWDay = TRUE;
+                wday = (WeekDay)num;
+                break;
+
+            case _T('x'):       // locale default date representation
+#ifdef HAVE_STRPTIME
+                // try using strptime() - it may fail even if the input is
+                // correct but the date is out of range, so we will fall back
+                // to our generic code anyhow (FIXME !Unicode friendly)
+                {
+                    struct tm tm;
+                    const wxChar *result = strptime(input, "%x", &tm);
+                    if ( result )
+                    {
+                        input = result;
+
+                        haveDay = haveMon = haveYear = TRUE;
+
+                        year = 1900 + tm.tm_year;
+                        mon = (Month)tm.tm_mon;
+                        mday = tm.tm_mday;
+
+                        break;
+                    }
+                }
+#endif // HAVE_STRPTIME
+
+                // TODO query the LOCALE_IDATE setting under Win32
+                {
+                    wxDateTime dt;
+
+                    wxString fmtDate, fmtDateAlt;
+                    if ( IsWestEuropeanCountry(GetCountry()) ||
+                         GetCountry() == Russia )
+                    {
+                        fmtDate = _T("%d/%m/%y");
+                        fmtDateAlt = _T("%m/%d/%y");
+                    }
+                    else // assume USA
+                    {
+                        fmtDate = _T("%m/%d/%y");
+                        fmtDateAlt = _T("%d/%m/%y");
+                    }
+
+                    const wxChar *result = dt.ParseFormat(input, fmtDate);
+
+                    if ( !result )
+                    {
+                        // ok, be nice and try another one
+                        result = dt.ParseFormat(input, fmtDateAlt);
+                    }
+
+                    if ( !result )
+                    {
+                        // bad luck
+                        return (wxChar *)NULL;
+                    }
+
+                    Tm tm = dt.GetTm();
+
+                    haveDay = haveMon = haveYear = TRUE;
+
+                    year = tm.year;
+                    mon = tm.mon;
+                    mday = tm.mday;
+
+                    input = result;
+                }
+
+                break;
+
+            case _T('X'):       // locale default time representation
+#ifdef HAVE_STRPTIME
+                {
+                    // use strptime() to do it for us (FIXME !Unicode friendly)
+                    struct tm tm;
+                    input = strptime(input, "%X", &tm);
+                    if ( !input )
+                    {
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = haveSec = TRUE;
+
+                    hour = tm.tm_hour;
+                    min = tm.tm_min;
+                    sec = tm.tm_sec;
+                }
+#else // !HAVE_STRPTIME
+                // TODO under Win32 we can query the LOCALE_ITIME system
+                //      setting which says whether the default time format is
+                //      24 or 12 hour
+                {
+                    // try to parse what follows as "%H:%M:%S" and, if this
+                    // fails, as "%I:%M:%S %p" - this should catch the most
+                    // common cases
+                    wxDateTime dt;
+
+                    const wxChar *result = dt.ParseFormat(input, _T("%T"));
+                    if ( !result )
+                    {
+                        result = dt.ParseFormat(input, _T("%r"));
+                    }
+
+                    if ( !result )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = haveSec = TRUE;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                    sec = tm.sec;
+
+                    input = result;
+                }
+#endif // HAVE_STRPTIME/!HAVE_STRPTIME
+                break;
+
+            case _T('y'):       // year without century (00-99)
+                if ( !GetNumericToken(input, &num) || (num > 99) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveYear = TRUE;
+                year = 1900 + (wxDateTime_t)num;
+                break;
+
+            case _T('Y'):       // year with century
+                if ( !GetNumericToken(input, &num) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveYear = TRUE;
+                year = (wxDateTime_t)num;
+                break;
+
+            case _T('Z'):       // timezone name
+                wxFAIL_MSG(_T("TODO"));
+                break;
+
+            case _T('%'):       // a percent sign
+                if ( *input++ != _T('%') )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+                break;
+
+            case 0:             // the end of string
+                wxFAIL_MSG(_T("unexpected format end"));
+
+                // fall through
+
+            default:            // not a known format spec
+                return (wxChar *)NULL;
+        }
+    }
+
+    // format matched, try to construct a date from what we have now
+    Tm tmDef;
+    if ( dateDef.IsValid() )
+    {
+        // take this date as default
+        tmDef = dateDef.GetTm();
+    }
+    else if ( m_time != 0 )
+    {
+        // if this date is valid, don't change it
+        tmDef = GetTm();
+    }
+    else
+    {
+        // no default and this date is invalid - fall back to Today()
+        tmDef = Today().GetTm();
+    }
+
+    Tm tm = tmDef;
+
+    // set the date
+    if ( haveYear )
+    {
+        tm.year = year;
+    }
+
+    // TODO we don't check here that the values are consistent, if both year
+    //      day and month/day were found, we just ignore the year day and we
+    //      also always ignore the week day
+    if ( haveMon && haveDay )
+    {
+        if ( mday > GetNumOfDaysInMonth(tm.year, mon) )
+        {
+            wxLogDebug(_T("bad month day in wxDateTime::ParseFormat"));
+
+            return (wxChar *)NULL;
+        }
+
+        tm.mon = mon;
+        tm.mday = mday;
+    }
+    else if ( haveYDay )
+    {
+        if ( yday > GetNumberOfDays(tm.year) )
+        {
+            wxLogDebug(_T("bad year day in wxDateTime::ParseFormat"));
+
+            return (wxChar *)NULL;
+        }
+
+        Tm tm2 = wxDateTime(1, Jan, tm.year).SetToYearDay(yday).GetTm();
+
+        tm.mon = tm2.mon;
+        tm.mday = tm2.mday;
+    }
+
+    // deal with AM/PM
+    if ( haveHour && hourIsIn12hFormat && isPM )
+    {
+        // translate to 24hour format
+        hour += 12;
+    }
+    //else: either already in 24h format or no translation needed
+
+    // set the time
+    if ( haveHour )
+    {
+        tm.hour = hour;
+    }
+
+    if ( haveMin )
+    {
+        tm.min = min;
+    }
+
+    if ( haveSec )
+    {
+        tm.sec = sec;
+    }
+
+    Set(tm);
+
+    return input;
+}
+
+const wxChar *wxDateTime::ParseDateTime(const wxChar *date)
+{
     wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
 
-    // find a public domain version of strptime() somewhere?
+    // there is a public domain version of getdate.y, but it only works for
+    // English...
     wxFAIL_MSG(_T("TODO"));
 
     return (wxChar *)NULL;
@@ -2176,16 +2971,36 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
     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 ( 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;
+        }
     }
 
     // what do we have?
@@ -2201,7 +3016,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
     int year = 0;
 
     // tokenize the string
-    wxStringTokenizer tok(p, _T(",/-\t "));
+    wxStringTokenizer tok(p, _T(",/-\t\n "));
     while ( tok.HasMoreTokens() )
     {
         wxString token = tok.GetNextToken();
@@ -2272,7 +3087,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                 haveYear = TRUE;
 
                 // no roll over - 99 means 99, not 1999 for us
-                year = val;
+                year = (wxDateTime_t)val;
             }
             else if ( isMonth )
             {
@@ -2316,12 +3131,12 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
 
                 haveDay = TRUE;
 
-                day = val;
+                day = (wxDateTime_t)val;
             }
         }
         else // not a number
         {
-            mon = GetMonthFromName(token);
+            mon = GetMonthFromName(token, Name_Full | Name_Abbr);
             if ( mon != Inv_Month )
             {
                 // it's a month
@@ -2334,7 +3149,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
             }
             else
             {
-                wday = GetWeekDayFromName(token);
+                wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
                 if ( wday != Inv_WeekDay )
                 {
                     // a week day
@@ -2463,11 +3278,80 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
 {
     wxCHECK_MSG( time, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
 
-    // this function should be able to parse different time formats as well as
-    // timezones (take the code out from ParseRfc822Date()) and AM/PM.
-    wxFAIL_MSG(_T("TODO"));
+    // first try some extra things
+    static const struct
+    {
+        const wxChar *name;
+        wxDateTime_t  hour;
+    } stdTimes[] =
+    {
+        { wxTRANSLATE("noon"),      12 },
+        { wxTRANSLATE("midnight"),  00 },
+        // anything else?
+    };
 
-    return (wxChar *)NULL;
+    for ( size_t n = 0; n < WXSIZEOF(stdTimes); n++ )
+    {
+        wxString timeString = wxGetTranslation(stdTimes[n].name);
+        size_t len = timeString.length();
+        if ( timeString.CmpNoCase(wxString(time, len)) == 0 )
+        {
+            Set(stdTimes[n].hour, 0, 0);
+
+            return time + len;
+        }
+    }
+
+    // try all time formats we may think about starting with the standard one
+    const wxChar *result = ParseFormat(time, _T("%X"));
+    if ( !result )
+    {
+        // normally, it's the same, but why not try it?
+        result = ParseFormat(time, _T("%H:%M:%S"));
+    }
+
+    if ( !result )
+    {
+        // 12hour with AM/PM?
+        result = ParseFormat(time, _T("%I:%M:%S %p"));
+    }
+
+    if ( !result )
+    {
+        // without seconds?
+        result = ParseFormat(time, _T("%H:%M"));
+    }
+
+    if ( !result )
+    {
+        // 12hour with AM/PM but without seconds?
+        result = ParseFormat(time, _T("%I:%M %p"));
+    }
+
+    if ( !result )
+    {
+        // just the hour?
+        result = ParseFormat(time, _T("%H"));
+    }
+
+    if ( !result )
+    {
+        // just the hour and AM/PM?
+        result = ParseFormat(time, _T("%I %p"));
+    }
+
+    // TODO: parse timezones
+
+    return result;
+}
+
+// ----------------------------------------------------------------------------
+// Workdays and holidays support
+// ----------------------------------------------------------------------------
+
+bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const
+{
+    return !wxDateTimeHolidayAuthority::IsHoliday(*this);
 }
 
 // ============================================================================
@@ -2495,7 +3379,7 @@ wxString wxTimeSpan::Format(const wxChar *format) const
     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++ )
     {
@@ -2555,3 +3439,123 @@ wxString wxTimeSpan::Format(const wxChar *format) const
 
     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();
+}
+
+