]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/datetime.cpp
use quotes around SRCROOT to handle the case when it contains spaces (patch 1912354)
[wxWidgets.git] / src / common / datetime.cpp
index 09215a759268c9e7ccc0e0d734d2f320915526c9..3d131c9503867dcc1f7cac73ab11e54061759d98 100644 (file)
@@ -1,13 +1,48 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/datetime.h
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/datetime.cpp
 // Purpose:     implementation of time/date related classes
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
+// Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+//              parts of code taken from sndcal library by Scott E. Lee:
+//
+//               Copyright 1993-1995, Scott E. Lee, all rights reserved.
+//               Permission granted to use, copy, modify, distribute and sell
+//               so long as the above copyright and this permission statement
+//               are retained in all copies.
+//
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+ * Implementation notes:
+ *
+ * 1. the time is stored as a 64bit integer containing the signed number of
+ *    milliseconds since Jan 1. 1970 (the Unix Epoch) - so it is always
+ *    expressed in GMT.
+ *
+ * 2. the range is thus something about 580 million years, but due to current
+ *    algorithms limitations, only dates from Nov 24, 4714BC are handled
+ *
+ * 3. standard ANSI C functions are used to do time calculations whenever
+ *    possible, i.e. when the date is in the range Jan 1, 1970 to 2038
+ *
+ * 4. otherwise, the calculations are done by converting the date to/from JDN
+ *    first (the range limitation mentioned above comes from here: the
+ *    algorithm used by Scott E. Lee's code only works for positive JDNs, more
+ *    or less)
+ *
+ * 5. the object constructed for the given DD-MM-YYYY HH:MM:SS corresponds to
+ *    this moment in local time and may be converted to the object
+ *    corresponding to the same date/time in another time zone by using
+ *    ToTimezone()
+ *
+ * 6. the conversions to the current (or any other) timezone are done when the
+ *    internal time representation is converted to the broken-down one in
+ *    wxDateTime::Tm.
+ */
 
 // ============================================================================
 // declarations
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "datetime.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
     #pragma hdrstop
 #endif
 
+#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
+
 #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
     #include "wx/string.h"
-    #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
+    #include "wx/module.h"
+    #include "wx/crt.h"
 #endif // WX_PRECOMP
 
 #include "wx/thread.h"
+#include "wx/tokenzr.h"
+
+#include <ctype.h>
 
-#define wxDEFINE_TIME_CONSTANTS
+#ifdef __WINDOWS__
+    #include <winnls.h>
+    #ifndef __WXWINCE__
+        #include <locale.h>
+    #endif
+#endif
 
 #include "wx/datetime.h"
 
+const long wxDateTime::TIME_T_FACTOR = 1000l;
+
+#if wxUSE_EXTENDED_RTTI
+
+template<> void wxStringReadValue(const wxString &s , wxDateTime &data )
+{
+    data.ParseFormat(s,"%Y-%m-%d %H:%M:%S", NULL);
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxDateTime &data )
+{
+    s = data.Format("%Y-%m-%d %H:%M:%S");
+}
+
+wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringConverter<wxDateTime>)
+
+#endif // wxUSE_EXTENDED_RTTI
+
+//
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+#if defined(HAVE_STRPTIME) && defined(__GLIBC__) && \
+        ((__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0))
+    // glibc 2.0.7 strptime() is broken - the following snippet causes it to
+    // crash (instead of just failing):
+    //
+    //      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()
+
+#if defined(HAVE_STRPTIME) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+    // configure detects strptime as linkable because it's in the OS X
+    // System library but MSL headers don't declare it.
+
+//    char *strptime(const char *, const char *, struct tm *);
+    // However, we DON'T want to just provide it here because we would
+    // crash and/or overwrite data when strptime from OS X tries
+    // to fill in MW's struct tm which is two fields shorter (no TZ stuff)
+    // So for now let's just say we don't have strptime
+    #undef HAVE_STRPTIME
+#endif
+
+#if defined(__MWERKS__) && wxUSE_UNICODE
+    #include <wtime.h>
+#endif
+
+#if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
+    #if defined(__WXPALMOS__)
+        #define WX_GMTOFF_IN_TM
+    #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
+        #define WX_TIMEZONE _timezone
+    #elif defined(__MWERKS__)
+        long wxmw_timezone = 28800;
+        #define WX_TIMEZONE wxmw_timezone
+    #elif defined(__DJGPP__) || defined(__WINE__)
+        #include <sys/timeb.h>
+        #include <values.h>
+        static long wxGetTimeZone()
+        {
+            static long timezone = MAXLONG; // invalid timezone
+            if (timezone == MAXLONG)
+            {
+                struct timeb tb;
+                ftime(&tb);
+                timezone = tb.timezone;
+            }
+            return timezone;
+        }
+        #define WX_TIMEZONE wxGetTimeZone()
+    #elif defined(__DARWIN__)
+        #define WX_GMTOFF_IN_TM
+    #elif defined(__WXWINCE__) && defined(__VISUALC8__)
+        // _timezone is not present in dynamic run-time library
+        #if 0
+        // Solution (1): use the function equivalent of _timezone
+        static long wxGetTimeZone()
+        {
+            static long s_Timezone = MAXLONG; // invalid timezone
+            if (s_Timezone == MAXLONG)
+            {
+                int t;
+                _get_timezone(& t);
+                s_Timezone = (long) t;
+            }
+            return s_Timezone;
+        }
+        #define WX_TIMEZONE wxGetTimeZone()
+        #elif 1
+        // Solution (2): using GetTimeZoneInformation
+        static long wxGetTimeZone()
+        {
+            static long timezone = MAXLONG; // invalid timezone
+            if (timezone == MAXLONG)
+            {
+                TIME_ZONE_INFORMATION tzi;
+                ::GetTimeZoneInformation(&tzi);
+                timezone = tzi.Bias;
+            }
+            return timezone;
+        }
+        #define WX_TIMEZONE wxGetTimeZone()
+        #else
+        // Old method using _timezone: this symbol doesn't exist in the dynamic run-time library (i.e. using /MD)
+        #define WX_TIMEZONE _timezone
+        #endif
+    #else // unknown platform - try timezone
+        #define WX_TIMEZONE timezone
+    #endif
+#endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM
+
+// everyone has strftime except Win CE unless VC8 is used
+#if !defined(__WXWINCE__) || defined(__VISUALC8__)
+    #define HAVE_STRFTIME
+#endif
+
+// NB: VC8 safe time functions could/should be used for wxMSW as well probably
+#if defined(__WXWINCE__) && defined(__VISUALC8__)
+
+struct tm *wxLocaltime_r(const time_t *t, struct tm* tm)
+{
+    __time64_t t64 = *t;
+    return _localtime64_s(tm, &t64) == 0 ? tm : NULL;
+}
+
+struct tm *wxGmtime_r(const time_t* t, struct tm* tm)
+{
+    __time64_t t64 = *t;
+    return _gmtime64_s(tm, &t64) == 0 ? tm : NULL;
+}
+
+#else // !wxWinCE with VC8
+
+#if (!defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)) && wxUSE_THREADS && !defined(__WINDOWS__)
+static wxMutex timeLock;
+#endif
+
+#ifndef HAVE_LOCALTIME_R
+struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp)
+{
+#if wxUSE_THREADS && !defined(__WINDOWS__)
+  // No need to waste time with a mutex on windows since it's using
+  // thread local storage for localtime anyway.
+  wxMutexLocker locker(timeLock);
+#endif
+
+  // Borland CRT crashes when passed 0 ticks for some reason, see SF bug 1704438
+#ifdef __BORLANDC__
+  if ( !*ticks )
+      return NULL;
+#endif
+
+  const tm * const t = localtime(ticks);
+  if ( !t )
+      return NULL;
+
+  memcpy(temp, t, sizeof(struct tm));
+  return temp;
+}
+#endif // !HAVE_LOCALTIME_R
+
+#ifndef HAVE_GMTIME_R
+struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)
+{
+#if wxUSE_THREADS && !defined(__WINDOWS__)
+  // No need to waste time with a mutex on windows since it's
+  // using thread local storage for gmtime anyway.
+  wxMutexLocker locker(timeLock);
+#endif
+
+#ifdef __BORLANDC__
+  if ( !*ticks )
+      return NULL;
+#endif
+
+  const tm * const t = gmtime(ticks);
+  if ( !t )
+      return NULL;
+
+  memcpy(temp, gmtime(ticks), sizeof(struct tm));
+  return temp;
+}
+#endif // !HAVE_GMTIME_R
+
+#endif // wxWinCE with VC8/other platforms
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// debugging helper: just a convenient replacement of wxCHECK()
+#define wxDATETIME_CHECK(expr, msg) \
+    wxCHECK2_MSG(expr, *this = wxInvalidDateTime; return *this, msg)
+
+// ----------------------------------------------------------------------------
+// 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
 // ----------------------------------------------------------------------------
 // some trivial ones
 static const int MONTHS_IN_YEAR = 12;
 
-static const int SECONDS_IN_MINUTE = 60;
+static const int SEC_PER_MIN = 60;
+
+static const int MIN_PER_HOUR = 60;
+
+static const int HOURS_PER_DAY = 24;
 
 static const long SECONDS_PER_DAY = 86400l;
 
+static const int DAYS_PER_WEEK = 7;
+
 static const long MILLISECONDS_PER_DAY = 86400000l;
 
 // this is the integral part of JDN of the midnight of Jan 1, 1970
 // (i.e. JDN(Jan 1, 1970) = 2440587.5)
-static const int EPOCH_JDN = 2440587;
+static const long EPOCH_JDN = 2440587l;
+
+// used only in asserts
+#ifdef __WXDEBUG__
+// the date of JDN -0.5 (as we don't work with fractional parts, this is the
+// reference date for us) is Nov 24, 4714BC
+static const int JDN_0_YEAR = -4713;
+static const int JDN_0_MONTH = wxDateTime::Nov;
+static const int JDN_0_DAY = 24;
+#endif // __WXDEBUG__
+
+// the constants used for JDN calculations
+static const long JDN_OFFSET         = 32046l;
+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 }
+};
 
 // ----------------------------------------------------------------------------
-// globals
+// global data
 // ----------------------------------------------------------------------------
 
-// a critical section is needed to protect GetTimeZone() static
-// variable in MT case
-#ifdef wxUSE_THREADS
-    wxCriticalSection gs_critsectTimezone;
-#endif // wxUSE_THREADS
+const char *wxDefaultDateTimeFormat = "%c";
+const char *wxDefaultTimeSpanFormat = "%H:%M:%S";
+
+// in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
+// indicate an invalid wxDateTime object
+const wxDateTime wxDefaultDateTime;
+
+wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
 
 // ----------------------------------------------------------------------------
 // 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)
@@ -86,89 +401,145 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
     return daysInMonth[wxDateTime::IsLeapYear(year)][month];
 }
 
-// ensure that the timezone variable is set by calling localtime
+// returns the time zone in the C sense, i.e. the difference UTC - local
+// (in seconds)
 static int GetTimeZone()
 {
-    // set to TRUE when the timezone is set
-    static bool s_timezoneSet = FALSE;
-
-    wxCRIT_SECT_LOCKER(lock, gs_critsectTimezone);
+    // set to true when the timezone is set
+    static bool s_timezoneSet = false;
+    static long gmtoffset = LONG_MAX; // invalid timezone
 
+    // ensure that the timezone variable is set by calling wxLocaltime_r
     if ( !s_timezoneSet )
     {
-        // just call localtime() instead of figurin out whether this system
-        // supports tzset(), _tzset() or something else
-        time_t t;
-        (void)localtime(&t);
+        // just call wxLocaltime_r() instead of figuring out whether this
+        // system supports tzset(), _tzset() or something else
+        time_t t = 0;
+        struct tm tm;
 
-        s_timezoneSet = TRUE;
+        wxLocaltime_r(&t, &tm);
+        s_timezoneSet = true;
+
+#ifdef WX_GMTOFF_IN_TM
+        // note that GMT offset is the opposite of time zone and so to return
+        // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
+        // cases we have to negate it
+        gmtoffset = -tm.tm_gmtoff;
+#else // !WX_GMTOFF_IN_TM
+        gmtoffset = WX_TIMEZONE;
+#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
     }
 
-    return (int)timezone;
+    return (int)gmtoffset;
 }
 
 // return the integral part of the JDN for the midnight of the given date (to
-// get the real JDN you need to add 0.5, this is, in fact, JDN of the noon of
-// the previous day)
+// get the real JDN you need to add 0.5, this is, in fact, JDN of the
+// noon of the previous day)
 static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
                             wxDateTime::Month mon,
                             int year)
 {
-    // CREDIT: the algorithm was taken from Peter Baum's home page
-
-    // the algorithm assumes Jan == 1
-    int month = mon + 1;
-
-    // we want the leap day (Feb 29) be at the end of the year, so we count
-    // March as the first month
-    if ( month < wxDateTime::Mar + 1 )
+    // CREDIT: code below is by Scott E. Lee (but bugs are mine)
+
+    // check the date validity
+    wxASSERT_MSG(
+      (year > JDN_0_YEAR) ||
+      ((year == JDN_0_YEAR) && (mon > JDN_0_MONTH)) ||
+      ((year == JDN_0_YEAR) && (mon == JDN_0_MONTH) && (day >= JDN_0_DAY)),
+      _T("date out of range - can't convert to JDN")
+                );
+
+    // make the year positive to avoid problems with negative numbers division
+    year += 4800;
+
+    // months are counted from March here
+    int month;
+    if ( mon >= wxDateTime::Mar )
     {
-        month += MONTHS_IN_YEAR;
-        year--;
+        month = mon - 2;
     }
-
-    // this table contains the number of the days before the 1st of the each
-    // month (in a non leap year) with the third value corresponding to March
-    // (and the last one to February)
-    static const int monthOffsets[14] =
+    else
     {
-        0, 31, 61, 92, 122, 153, 184, 214, 245, 275, 306
-    };
+        month = mon + 10;
+        year--;
+    }
 
-    // and now add contributions of all terms together to get the result (you'd
-    // better see the Web page for the description if you want to understand
-    // why it works (if it does :-))
-    return day +
-           // linear approximation for months
-           monthOffsets[month - (wxDateTime::Mar + 1)] +
-           // the year contribution
-           365*year + year/4 - year/100 + year/400 +
-           // 1721119.5 is the JDN of the midnight of Mar 1, year 0
-           1721118;
+    // now we can simply add all the contributions together
+    return ((year / 100) * DAYS_PER_400_YEARS) / 4
+            + ((year % 100) * DAYS_PER_4_YEARS) / 4
+            + (month * DAYS_PER_5_MONTHS + 2) / 5
+            + day
+            - JDN_OFFSET;
 }
 
-// this function is a wrapper around strftime(3)
-static wxString CallStrftime(const wxChar *format, const tm* tm)
+#ifdef HAVE_STRFTIME
+
+// this function is a wrapper around strftime(3) adding error checking
+static wxString CallStrftime(const wxString& format, const tm* tm)
 {
-    wxChar buf[1024];
+    wxChar buf[4096];
+    // Create temp wxString here to work around mingw/cygwin bug 1046059
+    // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435
+    wxString s;
+
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
     {
-        // is ti really possible that 1024 is too short?
+        // buffer is too small?
         wxFAIL_MSG(_T("strftime() failed"));
     }
 
-    return wxString(buf);
+    s = buf;
+    return s;
+}
+
+#endif // HAVE_STRFTIME
+
+#ifdef HAVE_STRPTIME
+
+#if wxUSE_UNIX && !defined(HAVE_STRPTIME_DECL)
+    // configure detected that we had strptime() but not its declaration,
+    // provide it ourselves
+    extern "C" char *strptime(const char *, const char *, struct tm *);
+#endif
+
+// Unicode-friendly strptime() wrapper
+static const wxStringCharType *
+CallStrptime(const wxStringCharType *input, const char *fmt, tm *tm)
+{
+    // the problem here is that strptime() returns pointer into the string we
+    // passed to it while we're really interested in the pointer into the
+    // original, Unicode, string so we try to transform the pointer back
+#if wxUSE_UNICODE_WCHAR
+    wxCharBuffer inputMB(wxConvertWX2MB(input));
+#else // ASCII
+    const char * const inputMB = input;
+#endif // Unicode/Ascii
+
+    const char *result = strptime(inputMB, fmt, tm);
+    if ( !result )
+        return NULL;
+
+#if wxUSE_UNICODE_WCHAR
+    // FIXME: this is wrong in presence of surrogates &c
+    return input + (result - inputMB.data());
+#else // ASCII
+    return result;
+#endif // Unicode/Ascii
 }
 
+#endif // HAVE_STRPTIME
+
 // if year and/or month have invalid values, replace them with the current ones
 static void ReplaceDefaultYearMonthWithCurrent(int *year,
                                                wxDateTime::Month *month)
 {
     struct tm *tmNow = NULL;
+    struct tm tmstruct;
 
     if ( *year == wxDateTime::Inv_Year )
     {
-        tmNow = wxDateTime::GetTmNow();
+        tmNow = wxDateTime::GetTmNow(&tmstruct);
 
         *year = 1900 + tmNow->tm_year;
     }
@@ -176,23 +547,128 @@ static void ReplaceDefaultYearMonthWithCurrent(int *year,
     if ( *month == wxDateTime::Inv_Month )
     {
         if ( !tmNow )
-            tmNow = wxDateTime::GetTmNow();
+            tmNow = wxDateTime::GetTmNow(&tmstruct);
 
         *month = (wxDateTime::Month)tmNow->tm_mon;
     }
 }
 
+// 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, int flags)
+{
+    wxDateTime::Month mon;
+    for ( mon = wxDateTime::Jan; mon < wxDateTime::Inv_Month; wxNextMonth(mon) )
+    {
+        // case-insensitive comparison either one of or with both abbreviated
+        // and not versions
+        if ( flags & wxDateTime::Name_Full )
+        {
+            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;
+            }
+        }
+    }
+
+    return mon;
+}
+
+// return the weekday if the string is a weekday name or Inv_WeekDay otherwise
+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 either one of or with both abbreviated
+        // and not versions
+        if ( flags & wxDateTime::Name_Full )
+        {
+            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;
+}
+
+/* static */
+struct tm *wxDateTime::GetTmNow(struct tm *tmstruct)
+{
+    time_t t = GetTimeNow();
+    return wxLocaltime_r(&t, tmstruct);
+}
+
+// scans all digits (but no more than len) and returns the resulting number
+static bool GetNumericToken(size_t len,
+                            const wxStringCharType*& p,
+                            unsigned long *number)
+{
+    size_t n = 1;
+    wxString s;
+    while ( wxIsdigit(*p) )
+    {
+        s += *p++;
+
+        if ( len && ++n > len )
+            break;
+    }
+
+    return !s.empty() && s.ToULong(number);
+}
+
+// scans all alphabetic characters and returns the resulting string
+static wxString GetAlphaToken(const wxStringCharType*& 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
 // ----------------------------------------------------------------------------
@@ -206,30 +682,34 @@ wxDateTime::Tm::Tm()
     wday = wxDateTime::Inv_WeekDay;
 }
 
-wxDateTime::Tm::Tm(const struct tm& tm)
+wxDateTime::Tm::Tm(const struct tm& tm, const TimeZone& tz)
+              : m_tz(tz)
 {
     msec = 0;
-    sec = tm.tm_sec;
-    min = tm.tm_min;
-    hour = tm.tm_hour;
-    mday = tm.tm_mday;
+    sec = (wxDateTime::wxDateTime_t)tm.tm_sec;
+    min = (wxDateTime::wxDateTime_t)tm.tm_min;
+    hour = (wxDateTime::wxDateTime_t)tm.tm_hour;
+    mday = (wxDateTime::wxDateTime_t)tm.tm_mday;
     mon = (wxDateTime::Month)tm.tm_mon;
     year = 1900 + tm.tm_year;
-    wday = tm.tm_wday;
-    yday = tm.tm_yday;
+    wday = (wxDateTime::wxDateTime_t)tm.tm_wday;
+    yday = (wxDateTime::wxDateTime_t)tm.tm_yday;
 }
 
 bool wxDateTime::Tm::IsValid() const
 {
     // we allow for the leap seconds, although we don't use them (yet)
     return (year != wxDateTime::Inv_Year) && (mon != wxDateTime::Inv_Month) &&
-           (mday < GetNumOfDaysInMonth(year, mon)) &&
+           (mday <= GetNumOfDaysInMonth(year, mon)) &&
            (hour < 24) && (min < 60) && (sec < 62) && (msec < 1000);
 }
 
 void wxDateTime::Tm::ComputeWeekDay()
 {
-    wxFAIL_MSG(_T("TODO"));
+    // compute the week day from day/month/year: we use the dumbest algorithm
+    // possible: just compute our JDN and then use the (simple to derive)
+    // formula: weekday = (JDN + 1.5) % 7
+    wday = (wxDateTime::wxDateTime_t)((GetTruncatedJDN(mday, mon, year) + 2) % 7);
 }
 
 void wxDateTime::Tm::AddMonths(int monDiff)
@@ -242,27 +722,32 @@ void wxDateTime::Tm::AddMonths(int monDiff)
         monDiff += MONTHS_IN_YEAR;
     }
 
-    while ( monDiff + mon > MONTHS_IN_YEAR )
+    while ( monDiff + mon >= MONTHS_IN_YEAR )
     {
         year++;
+
+        monDiff -= MONTHS_IN_YEAR;
     }
 
     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 = (wxDateTime::wxDateTime_t)( mday + dayDiff );
     while ( mday > GetNumOfDaysInMonth(year, mon) )
     {
         mday -= GetNumOfDaysInMonth(year, mon);
@@ -283,7 +768,9 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
     switch ( tz )
     {
         case wxDateTime::Local:
-            // leave offset to be 0
+            // get the offset from C RTL: it returns the difference GMT-local
+            // while we want to have the offset _from_ GMT, hence the '-'
+            m_offset = -GetTimeZone();
             break;
 
         case wxDateTime::GMT_12:
@@ -298,7 +785,7 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
         case wxDateTime::GMT_3:
         case wxDateTime::GMT_2:
         case wxDateTime::GMT_1:
-            m_offset = -60*(wxDateTime::GMT0 - tz);
+            m_offset = -3600*(wxDateTime::GMT0 - tz);
             break;
 
         case wxDateTime::GMT0:
@@ -314,12 +801,13 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
         case wxDateTime::GMT10:
         case wxDateTime::GMT11:
         case wxDateTime::GMT12:
-            m_offset = 60*(tz - wxDateTime::GMT0);
+        case wxDateTime::GMT13:
+            m_offset = 3600*(tz - wxDateTime::GMT0);
             break;
 
         case wxDateTime::A_CST:
             // Central Standard Time in use in Australia = UTC + 9.5
-            m_offset = 9*60 + 30;
+            m_offset = 60l*(9*MIN_PER_HOUR + MIN_PER_HOUR/2);
             break;
 
         default:
@@ -354,7 +842,7 @@ bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal)
     {
         wxFAIL_MSG(_T("unknown calendar"));
 
-        return FALSE;
+        return false;
     }
 }
 
@@ -364,12 +852,6 @@ int wxDateTime::GetCentury(int year)
     return year > 0 ? year / 100 : year / 100 - 1;
 }
 
-/* static */
-void wxDateTime::SetCountry(wxDateTime::Country country)
-{
-    ms_country = country;
-}
-
 /* static */
 int wxDateTime::ConvertYearToBC(int year)
 {
@@ -404,7 +886,6 @@ wxDateTime::Month wxDateTime::GetCurrentMonth(wxDateTime::Calendar cal)
     {
         case Gregorian:
             return Now().GetMonth();
-            break;
 
         case Julian:
             wxFAIL_MSG(_T("TODO"));
@@ -432,7 +913,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"));
@@ -468,74 +948,499 @@ 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") );
-
-    tm tm = { 0, 0, 0, 1, month, 76 };  // any year will do
-
-    return CallStrftime(abbr ? _T("%b") : _T("%B"), &tm);
+    wxCHECK_MSG( month != Inv_Month, wxEmptyString, _T("invalid month") );
+#ifdef HAVE_STRFTIME
+    // 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;
+    InitTm(tm);
+    tm.tm_mon = month;
+
+    return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &tm);
+#else // !HAVE_STRFTIME
+    wxString ret;
+    switch(month)
+    {
+        case Jan:
+            ret = (flags == Name_Abbr ? wxT("Jan"): wxT("January"));
+            break;
+        case Feb:
+            ret = (flags == Name_Abbr ? wxT("Feb"): wxT("Febuary"));
+            break;
+        case Mar:
+            ret = (flags == Name_Abbr ? wxT("Mar"): wxT("March"));
+            break;
+        case Apr:
+            ret = (flags == Name_Abbr ? wxT("Apr"): wxT("April"));
+            break;
+        case May:
+            ret = (flags == Name_Abbr ? wxT("May"): wxT("May"));
+            break;
+        case Jun:
+            ret = (flags == Name_Abbr ? wxT("Jun"): wxT("June"));
+            break;
+        case Jul:
+            ret = (flags == Name_Abbr ? wxT("Jul"): wxT("July"));
+            break;
+        case Aug:
+            ret = (flags == Name_Abbr ? wxT("Aug"): wxT("August"));
+            break;
+        case Sep:
+            ret = (flags == Name_Abbr ? wxT("Sep"): wxT("September"));
+            break;
+        case Oct:
+            ret = (flags == Name_Abbr ? wxT("Oct"): wxT("October"));
+            break;
+        case Nov:
+            ret = (flags == Name_Abbr ? wxT("Nov"): wxT("November"));
+            break;
+        case Dec:
+            ret = (flags == Name_Abbr ? wxT("Dec"): wxT("December"));
+            break;
+    }
+    return ret;
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
 }
 
 /* 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") );
+    wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, _T("invalid weekday") );
+#ifdef HAVE_STRFTIME
+    // take some arbitrary Sunday (but notice that the day should be such that
+    // after adding wday to it below we still have a valid date, e.g. don't
+    // take 28 here!)
+    tm tm;
+    InitTm(tm);
+    tm.tm_mday = 21;
+    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;
 
-    // take some arbitrary Sunday
-    tm tm = { 0, 0, 0, 28, Nov, 99 };
+    // call mktime() to normalize it...
+    (void)mktime(&tm);
 
-    // and offset it by the number of days needed to get 
-    tm.tm_mday += wday;
+    // ... and call strftime()
+    return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm);
+#else // !HAVE_STRFTIME
+    wxString ret;
+    switch(wday)
+    {
+        case Sun:
+            ret = (flags == Name_Abbr ? wxT("Sun") : wxT("Sunday"));
+            break;
+        case Mon:
+            ret = (flags == Name_Abbr ? wxT("Mon") : wxT("Monday"));
+            break;
+        case Tue:
+            ret = (flags == Name_Abbr ? wxT("Tue") : wxT("Tuesday"));
+            break;
+        case Wed:
+            ret = (flags == Name_Abbr ? wxT("Wed") : wxT("Wednesday"));
+            break;
+        case Thu:
+            ret = (flags == Name_Abbr ? wxT("Thu") : wxT("Thursday"));
+            break;
+        case Fri:
+            ret = (flags == Name_Abbr ? wxT("Fri") : wxT("Friday"));
+            break;
+        case Sat:
+            ret = (flags == Name_Abbr ? wxT("Sat") : wxT("Saturday"));
+            break;
+    }
+    return ret;
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+}
 
-    return CallStrftime(abbr ? _T("%a") : _T("%A"), &tm);
+/* static */
+void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
+{
+    tm tm;
+    InitTm(tm);
+    wxChar buffer[64];
+    // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
+    // and causes an assertion failed if the buffer is to small (which is good) - OR -
+    // if strftime does not return anything because the format string is invalid - OR -
+    // if there are no 'am' / 'pm' tokens defined for the current locale (which is not good).
+    // wxDateTime::ParseTime will try several different formats to parse the time.
+    // As a result, GetAmPmStrings might get called, even if the current locale
+    // does not define any 'am' / 'pm' tokens. In this case, wxStrftime would
+    // assert, even though it is a perfectly legal use.
+    if ( am )
+    {
+        if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0)
+            *am = wxString(buffer);
+        else
+            *am = wxString();
+    }
+    if ( pm )
+    {
+        tm.tm_hour = 13;
+        if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0)
+            *pm = wxString(buffer);
+        else
+            *pm = wxString();
+    }
 }
 
 // ----------------------------------------------------------------------------
-// constructors and assignment operators
+// Country stuff: date calculations depend on the country (DST, work days,
+// ...), so we need to know which rules to follow.
 // ----------------------------------------------------------------------------
 
-wxDateTime& wxDateTime::Set(const struct tm& tm1)
+/* static */
+wxDateTime::Country wxDateTime::GetCountry()
 {
-    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-
-    tm tm2(tm1);
-    time_t timet = mktime(&tm2);
-    if ( timet == (time_t)(-1) )
+    // TODO use LOCALE_ICOUNTRY setting under Win32
+#ifndef __WXWINCE__
+    if ( ms_country == Country_Unknown )
     {
-        wxFAIL_MSG(_T("Invalid time"));
+        // try to guess from the time zone name
+        time_t t = time(NULL);
+        struct tm tmstruct;
+        struct tm *tm = wxLocaltime_r(&t, &tmstruct);
 
-        return ms_InvDateTime;
-    }
-    else
-    {
-        return Set(timet);
+        wxString tz = CallStrftime(_T("%Z"), tm);
+        if ( tz == _T("WET") || tz == _T("WEST") )
+        {
+            ms_country = UK;
+        }
+        else if ( tz == _T("CET") || tz == _T("CEST") )
+        {
+            ms_country = Country_EEC;
+        }
+        else if ( tz == _T("MSK") || tz == _T("MSD") )
+        {
+            ms_country = Russia;
+        }
+        else if ( tz == _T("AST") || tz == _T("ADT") ||
+                  tz == _T("EST") || tz == _T("EDT") ||
+                  tz == _T("CST") || tz == _T("CDT") ||
+                  tz == _T("MST") || tz == _T("MDT") ||
+                  tz == _T("PST") || tz == _T("PDT") )
+        {
+            ms_country = USA;
+        }
+        else
+        {
+            // well, choose a default one
+            ms_country = USA;
+        }
     }
+#else // __WXWINCE__
+     ms_country = USA;
+#endif // !__WXWINCE__/__WXWINCE__
+
+    return ms_country;
 }
 
-wxDateTime& wxDateTime::Set(wxDateTime_t hour,
-                            wxDateTime_t minute,
-                            wxDateTime_t second,
-                            wxDateTime_t millisec)
+/* static */
+void wxDateTime::SetCountry(wxDateTime::Country country)
 {
-    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+    ms_country = country;
+}
 
-    // we allow seconds to be 61 to account for the leap seconds, even if we
-    // don't use them really
-    wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000,
-                 ms_InvDateTime,
-                 _T("Invalid time in wxDateTime::Set()") );
+/* static */
+bool wxDateTime::IsWestEuropeanCountry(Country country)
+{
+    if ( country == Country_Default )
+    {
+        country = GetCountry();
+    }
+
+    return (Country_WesternEurope_Start <= country) &&
+           (country <= Country_WesternEurope_End);
+}
+
+// ----------------------------------------------------------------------------
+// DST calculations: we use 3 different rules for the West European countries,
+// USA and for the rest of the world. This is undoubtedly false for many
+// countries, but I lack the necessary info (and the time to gather it),
+// please add the other rules here!
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxDateTime::IsDSTApplicable(int year, Country country)
+{
+    if ( year == Inv_Year )
+    {
+        // take the current year if none given
+        year = GetCurrentYear();
+    }
+
+    if ( country == Country_Default )
+    {
+        country = GetCountry();
+    }
+
+    switch ( country )
+    {
+        case USA:
+        case UK:
+            // DST was first observed in the US and UK during WWI, reused
+            // during WWII and used again since 1966
+            return year >= 1966 ||
+                   (year >= 1942 && year <= 1945) ||
+                   (year == 1918 || year == 1919);
+
+        default:
+            // assume that it started after WWII
+            return year > 1950;
+    }
+}
+
+/* static */
+wxDateTime wxDateTime::GetBeginDST(int year, Country country)
+{
+    if ( year == Inv_Year )
+    {
+        // take the current year if none given
+        year = GetCurrentYear();
+    }
+
+    if ( country == Country_Default )
+    {
+        country = GetCountry();
+    }
+
+    if ( !IsDSTApplicable(year, country) )
+    {
+        return wxInvalidDateTime;
+    }
+
+    wxDateTime dt;
+
+    if ( IsWestEuropeanCountry(country) || (country == Russia) )
+    {
+        // DST begins at 1 a.m. GMT on the last Sunday of March
+        if ( !dt.SetToLastWeekDay(Sun, Mar, year) )
+        {
+            // weird...
+            wxFAIL_MSG( _T("no last Sunday in March?") );
+        }
+
+        dt += wxTimeSpan::Hours(1);
+    }
+    else switch ( country )
+    {
+        case USA:
+            switch ( year )
+            {
+                case 1918:
+                case 1919:
+                    // don't know for sure - assume it was in effect all year
+
+                case 1943:
+                case 1944:
+                case 1945:
+                    dt.Set(1, Jan, year);
+                    break;
+
+                case 1942:
+                    // DST was installed Feb 2, 1942 by the Congress
+                    dt.Set(2, Feb, year);
+                    break;
+
+                    // Oil embargo changed the DST period in the US
+                case 1974:
+                    dt.Set(6, Jan, 1974);
+                    break;
+
+                case 1975:
+                    dt.Set(23, Feb, 1975);
+                    break;
+
+                default:
+                    // before 1986, DST begun on the last Sunday of April, but
+                    // in 1986 Reagan changed it to begin at 2 a.m. of the
+                    // first Sunday in April
+                    if ( year < 1986 )
+                    {
+                        if ( !dt.SetToLastWeekDay(Sun, Apr, year) )
+                        {
+                            // weird...
+                            wxFAIL_MSG( _T("no first Sunday in April?") );
+                        }
+                    }
+                    else
+                    {
+                        if ( !dt.SetToWeekDay(Sun, 1, Apr, year) )
+                        {
+                            // weird...
+                            wxFAIL_MSG( _T("no first Sunday in April?") );
+                        }
+                    }
+
+                    dt += wxTimeSpan::Hours(2);
+
+                    // TODO what about timezone??
+            }
+
+            break;
+
+        default:
+            // assume Mar 30 as the start of the DST for the rest of the world
+            // - totally bogus, of course
+            dt.Set(30, Mar, year);
+    }
+
+    return dt;
+}
+
+/* static */
+wxDateTime wxDateTime::GetEndDST(int year, Country country)
+{
+    if ( year == Inv_Year )
+    {
+        // take the current year if none given
+        year = GetCurrentYear();
+    }
+
+    if ( country == Country_Default )
+    {
+        country = GetCountry();
+    }
+
+    if ( !IsDSTApplicable(year, country) )
+    {
+        return wxInvalidDateTime;
+    }
+
+    wxDateTime dt;
+
+    if ( IsWestEuropeanCountry(country) || (country == Russia) )
+    {
+        // DST ends at 1 a.m. GMT on the last Sunday of October
+        if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
+        {
+            // weirder and weirder...
+            wxFAIL_MSG( _T("no last Sunday in October?") );
+        }
+
+        dt += wxTimeSpan::Hours(1);
+    }
+    else switch ( country )
+    {
+        case USA:
+            switch ( year )
+            {
+                case 1918:
+                case 1919:
+                    // don't know for sure - assume it was in effect all year
+
+                case 1943:
+                case 1944:
+                    dt.Set(31, Dec, year);
+                    break;
+
+                case 1945:
+                    // the time was reset after the end of the WWII
+                    dt.Set(30, Sep, year);
+                    break;
+
+                default:
+                    // DST ends at 2 a.m. on the last Sunday of October
+                    if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
+                    {
+                        // weirder and weirder...
+                        wxFAIL_MSG( _T("no last Sunday in October?") );
+                    }
+
+                    dt += wxTimeSpan::Hours(2);
+
+                    // TODO what about timezone??
+            }
+            break;
+
+        default:
+            // assume October 26th as the end of the DST - totally bogus too
+            dt.Set(26, Oct, year);
+    }
+
+    return dt;
+}
+
+// ----------------------------------------------------------------------------
+// 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)
+{
+    struct tm tm2(tm);
+    time_t timet = mktime(&tm2);
+
+    if ( timet == (time_t)-1 )
+    {
+        // mktime() rather unintuitively fails for Jan 1, 1970 if the hour is
+        // less than timezone - try to make it work for this case
+        if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
+        {
+            return Set((time_t)(
+                       GetTimeZone() +
+                       tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
+                       tm2.tm_min * SEC_PER_MIN +
+                       tm2.tm_sec));
+        }
+
+        wxFAIL_MSG( _T("mktime() failed") );
+
+        *this = wxInvalidDateTime;
+
+        return *this;
+    }
+    else
+    {
+        return Set(timet);
+    }
+}
+
+wxDateTime& wxDateTime::Set(wxDateTime_t hour,
+                            wxDateTime_t minute,
+                            wxDateTime_t second,
+                            wxDateTime_t millisec)
+{
+    // we allow seconds to be 61 to account for the leap seconds, even if we
+    // don't use them really
+    wxDATETIME_CHECK( hour < 24 &&
+                      second < 62 &&
+                      minute < 60 &&
+                      millisec < 1000,
+                      _T("Invalid time in wxDateTime::Set()") );
 
     // get the current date from system
-    time_t timet = GetTimeNow();
-    struct tm *tm = localtime(&timet);
+    struct tm tmstruct;
+    struct tm *tm = GetTmNow(&tmstruct);
+
+    wxDATETIME_CHECK( tm, _T("wxLocaltime_r() failed") );
+
+    // make a copy so it isn't clobbered by the call to mktime() below
+    struct tm tm1(*tm);
 
     // adjust the time
-    tm->tm_hour = hour;
-    tm->tm_min = minute;
-    tm->tm_sec = second;
+    tm1.tm_hour = hour;
+    tm1.tm_min = minute;
+    tm1.tm_sec = second;
+
+    // and the DST in case it changes on this date
+    struct tm tm2(tm1);
+    mktime(&tm2);
+    if ( tm2.tm_isdst != tm1.tm_isdst )
+        tm1.tm_isdst = tm2.tm_isdst;
 
-    (void)Set(*tm);
+    (void)Set(tm1);
 
     // and finally adjust milliseconds
     return SetMillisecond(millisec);
@@ -549,16 +1454,16 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
                             wxDateTime_t second,
                             wxDateTime_t millisec)
 {
-    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-
-    wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000,
-                 ms_InvDateTime,
-                 _T("Invalid time in wxDateTime::Set()") );
+    wxDATETIME_CHECK( hour < 24 &&
+                      second < 62 &&
+                      minute < 60 &&
+                      millisec < 1000,
+                      _T("Invalid time in wxDateTime::Set()") );
 
     ReplaceDefaultYearMonthWithCurrent(&year, &month);
 
-    wxCHECK_MSG( day <= GetNumberOfDays(month, year), ms_InvDateTime,
-                 _T("Invalid date in wxDateTime::Set()") );
+    wxDATETIME_CHECK( (0 < day) && (day <= GetNumberOfDays(month, year)),
+                      _T("Invalid date in wxDateTime::Set()") );
 
     // the range of time_t type (inclusive)
     static const int yearMinInRange = 1970;
@@ -577,11 +1482,15 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
         tm.tm_hour = hour;
         tm.tm_min = minute;
         tm.tm_sec = second;
+        tm.tm_isdst = -1;       // mktime() will guess it
 
         (void)Set(tm);
 
         // and finally adjust milliseconds
-        return SetMillisecond(millisec);
+        if (IsValid())
+            SetMillisecond(millisec);
+
+        return *this;
     }
     else
     {
@@ -593,7 +1502,8 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
         m_time -= EPOCH_JDN;
         m_time *= SECONDS_PER_DAY * TIME_T_FACTOR;
 
-        Add(wxTimeSpan(hour, minute, second, millisec));
+        // JDN corresponds to GMT, we take localtime
+        Add(wxTimeSpan(hour, minute, second + GetTimeZone(), millisec));
     }
 
     return *this;
@@ -601,16 +1511,128 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
 
 wxDateTime& wxDateTime::Set(double jdn)
 {
-    m_time = (jdn - 0.5 - EPOCH_JDN) * TIME_T_FACTOR;
+    // so that m_time will be 0 for the midnight of Jan 1, 1970 which is jdn
+    // EPOCH_JDN + 0.5
+    jdn -= EPOCH_JDN + 0.5;
+
+    m_time.Assign(jdn*MILLISECONDS_PER_DAY);
+
+    // JDNs always are in UTC, so we don't need any adjustments for time zone
+
+    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;
 }
 
+wxDateTime wxDateTime::GetDateOnly() const
+{
+    Tm tm = GetTm();
+    tm.msec =
+    tm.sec =
+    tm.min =
+    tm.hour = 0;
+    return wxDateTime(tm);
+}
+
+// ----------------------------------------------------------------------------
+// DOS Date and Time Format functions
+// ----------------------------------------------------------------------------
+// the dos date and time value is an unsigned 32 bit value in the format:
+// YYYYYYYMMMMDDDDDhhhhhmmmmmmsssss
+//
+// Y = year offset from 1980 (0-127)
+// M = month (1-12)
+// D = day of month (1-31)
+// h = hour (0-23)
+// m = minute (0-59)
+// s = bisecond (0-29) each bisecond indicates two seconds
+// ----------------------------------------------------------------------------
+
+wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
+{
+    struct tm tm;
+    InitTm(tm);
+
+    long year = ddt & 0xFE000000;
+    year >>= 25;
+    year += 80;
+    tm.tm_year = year;
+
+    long month = ddt & 0x1E00000;
+    month >>= 21;
+    month -= 1;
+    tm.tm_mon = month;
+
+    long day = ddt & 0x1F0000;
+    day >>= 16;
+    tm.tm_mday = day;
+
+    long hour = ddt & 0xF800;
+    hour >>= 11;
+    tm.tm_hour = hour;
+
+    long minute = ddt & 0x7E0;
+    minute >>= 5;
+    tm.tm_min = minute;
+
+    long second = ddt & 0x1F;
+    tm.tm_sec = second * 2;
+
+    return Set(mktime(&tm));
+}
+
+unsigned long wxDateTime::GetAsDOS() const
+{
+    unsigned long ddt;
+    time_t ticks = GetTicks();
+    struct tm tmstruct;
+    struct tm *tm = wxLocaltime_r(&ticks, &tmstruct);
+    wxCHECK_MSG( tm, ULONG_MAX, _T("time can't be represented in DOS format") );
+
+    long year = tm->tm_year;
+    year -= 80;
+    year <<= 25;
+
+    long month = tm->tm_mon;
+    month += 1;
+    month <<= 21;
+
+    long day = tm->tm_mday;
+    day <<= 16;
+
+    long hour = tm->tm_hour;
+    hour <<= 11;
+
+    long minute = tm->tm_min;
+    minute <<= 5;
+
+    long second = tm->tm_sec;
+    second /= 2;
+
+    ddt = year | month | day | hour | minute | second;
+    return ddt;
+}
+
 // ----------------------------------------------------------------------------
 // time_t <-> broken down time conversions
 // ----------------------------------------------------------------------------
 
-wxDateTime::Tm wxDateTime::GetTm() const
+wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
 {
     wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
 
@@ -618,60 +1640,125 @@ wxDateTime::Tm wxDateTime::GetTm() const
     if ( time != (time_t)-1 )
     {
         // use C RTL functions
-        tm *tm = localtime(&time);
+        struct tm tmstruct;
+        tm *tm;
+        if ( tz.GetOffset() == -GetTimeZone() )
+        {
+            // we are working with local time
+            tm = wxLocaltime_r(&time, &tmstruct);
 
-        // should never happen
-        wxCHECK_MSG( tm, Tm(), _T("localtime() failed") );
+            // should never happen
+            wxCHECK_MSG( tm, Tm(), _T("wxLocaltime_r() failed") );
+        }
+        else
+        {
+            time += (time_t)tz.GetOffset();
+#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
+            int time2 = (int) time;
+            if ( time2 >= 0 )
+#else
+            if ( time >= 0 )
+#endif
+            {
+                tm = wxGmtime_r(&time, &tmstruct);
 
-        return Tm(*tm);
-    }
-    else
-    {
-        // CREDIT: the algorithm was taken from Peter Baum's home page
-
-        // calculate the Gregorian date from JDN for the midnight of our date
-        wxLongLong timeMidnight = m_time;
-        long timeOnly = (m_time % MILLISECONDS_PER_DAY).GetLo();
-        timeMidnight -= timeOnly;
-
-        // TODO this probably could be optimised somehow...
-
-        double jdn = (timeMidnight / MILLISECONDS_PER_DAY).GetLo();
-        jdn += EPOCH_JDN + 0.5;
-        long z = jdn - 1721118.5;
-        double r = jdn - 1721118.5 - z;
-        double g = z - 0.25;
-        long a = g/36524.25;    // number of days per year
-        long b = a - a / 4;
-        int year = (b + g) / 365.25;
-        long c = b + z - 365.25*year;
-        int month = (5*c + 456)/153;
-        int day = c - (153*month - 457)/5 + (r < 0.5 ? 0 : 1);
-        if ( month > 12 )
+                // should never happen
+                wxCHECK_MSG( tm, Tm(), _T("wxGmtime_r() failed") );
+            }
+            else
+            {
+                tm = (struct tm *)NULL;
+            }
+        }
+
+        if ( tm )
         {
-            year++;
-            month -= 12;
+            // 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
+    }
 
-        Tm tm;
-        tm.year = year;
-        tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0
-        tm.mday = day;
-        tm.msec = timeOnly % 1000;
-        timeOnly -= tm.msec;
-        timeOnly /= 1000;               // now we have time in seconds
+    // remember the time and do the calculations with the date only - this
+    // eliminates rounding errors of the floating point arithmetics
+
+    wxLongLong timeMidnight = m_time + tz.GetOffset() * 1000;
+
+    long timeOnly = (timeMidnight % MILLISECONDS_PER_DAY).ToLong();
+
+    // we want to always have positive time and timeMidnight to be really
+    // the midnight before it
+    if ( timeOnly < 0 )
+    {
+        timeOnly = MILLISECONDS_PER_DAY + timeOnly;
+    }
+
+    timeMidnight -= timeOnly;
+
+    // calculate the Gregorian date from JDN for the midnight of our date:
+    // this will yield day, month (in 1..12 range) and year
 
-        tm.sec = timeOnly % 60;
-        timeOnly -= tm.sec;
-        timeOnly /= 60;                 // now we have time in minutes
+    // actually, this is the JDN for the noon of the previous day
+    long jdn = (timeMidnight / MILLISECONDS_PER_DAY).ToLong() + EPOCH_JDN;
 
-        tm.min = timeOnly % 60;
-        timeOnly -= tm.min;
+    // CREDIT: code below is by Scott E. Lee (but bugs are mine)
 
-        tm.hour = timeOnly / 60;
+    wxASSERT_MSG( jdn > -2, _T("JDN out of range") );
 
-        return tm;
+    // calculate the century
+    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;
+    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;
+    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 += 3;
     }
+    else
+    {
+        year += 1;
+        month -= 9;
+    }
+
+    // year is offset by 4800
+    year -= 4800;
+
+    // check that the algorithm gave us something reasonable
+    wxASSERT_MSG( (0 < month) && (month <= 12), _T("invalid month") );
+    wxASSERT_MSG( (1 <= day) && (day < 32), _T("invalid day") );
+
+    // construct Tm from these values
+    Tm tm;
+    tm.year = (int)year;
+    tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0
+    tm.mday = (wxDateTime_t)day;
+    tm.msec = (wxDateTime_t)(timeOnly % 1000);
+    timeOnly -= tm.msec;
+    timeOnly /= 1000;               // now we have time in seconds
+
+    tm.sec = (wxDateTime_t)(timeOnly % SEC_PER_MIN);
+    timeOnly -= tm.sec;
+    timeOnly /= SEC_PER_MIN;        // now we have time in minutes
+
+    tm.min = (wxDateTime_t)(timeOnly % MIN_PER_HOUR);
+    timeOnly -= tm.min;
+
+    tm.hour = (wxDateTime_t)(timeOnly / MIN_PER_HOUR);
+
+    return tm;
 }
 
 wxDateTime& wxDateTime::SetYear(int year)
@@ -761,10 +1848,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;
 }
 
@@ -772,51 +1876,203 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
 // Weekday and monthday stuff
 // ----------------------------------------------------------------------------
 
-wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
-                                          int year)
+// convert Sun, Mon, ..., Sat into 6, 0, ..., 5
+static inline int ConvertWeekDayToMondayBase(int wd)
 {
-    // take the current month/year if none specified
-    ReplaceDefaultYearMonthWithCurrent(&year, &month);
-
-    return Set(GetNumOfDaysInMonth(year, month), month, year);
+    return wd == wxDateTime::Sun ? 6 : wd - 1;
 }
 
-bool wxDateTime::SetToWeekDay(WeekDay weekday,
-                              int n,
-                              Month month,
-                              int year)
+/* static */
+wxDateTime
+wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd)
 {
-    wxCHECK_MSG( weekday != Inv_WeekDay, FALSE, _T("invalid weekday") );
+    wxASSERT_MSG( numWeek > 0,
+                  _T("invalid week number: weeks are counted from 1") );
 
-    // we don't check explicitly that -5 <= n <= 5 because we will return FALSE
-    // anyhow in such case - but may be should still give an assert for it?
+    // Jan 4 always lies in the 1st week of the year
+    wxDateTime dt(4, Jan, year);
+    dt.SetToWeekDayInSameWeek(wd);
+    dt += wxDateSpan::Weeks(numWeek - 1);
 
-    // take the current month/year if none specified
-    ReplaceDefaultYearMonthWithCurrent(&year, &month);
+    return dt;
+}
 
-    wxDateTime dt;
+#if WXWIN_COMPATIBILITY_2_6
+// use a separate function to avoid warnings about using deprecated
+// SetToTheWeek in GetWeek below
+static wxDateTime
+SetToTheWeek(int year,
+             wxDateTime::wxDateTime_t numWeek,
+             wxDateTime::WeekDay weekday,
+             wxDateTime::WeekFlags flags)
+{
+    // Jan 4 always lies in the 1st week of the year
+    wxDateTime dt(4, wxDateTime::Jan, year);
+    dt.SetToWeekDayInSameWeek(weekday, flags);
+    dt += wxDateSpan::Weeks(numWeek - 1);
 
-    // TODO this probably could be optimised somehow...
+    return dt;
+}
 
-    if ( n > 0 )
+bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
+                              WeekDay weekday,
+                              WeekFlags flags)
+{
+    int year = GetYear();
+    *this = ::SetToTheWeek(year, numWeek, weekday, flags);
+    if ( GetYear() != year )
     {
-        // get the first day of the month
-        dt.Set(1, month, year);
-
-        // get its wday
-        WeekDay wdayFirst = dt.GetWeekDay();
+        // oops... numWeek was too big
+        return false;
+    }
 
-        // go to the first weekday of the month
-        int diff = weekday - wdayFirst;
-        if ( diff < 0 )
-            diff += 7;
+    return true;
+}
 
-        // add advance n-1 weeks more
-        diff += 7*(n - 1);
+wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,
+                               WeekDay weekday,
+                               WeekFlags flags) const
+{
+    return ::SetToTheWeek(GetYear(), numWeek, weekday, flags);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
 
-        dt -= wxDateSpan::Days(diff);
+wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
+                                          int year)
+{
+    // take the current month/year if none specified
+    if ( year == Inv_Year )
+        year = GetYear();
+    if ( month == Inv_Month )
+        month = GetMonth();
+
+    return Set(GetNumOfDaysInMonth(year, month), month, year);
+}
+
+wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)
+{
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+
+    int wdayDst = weekday,
+        wdayThis = GetWeekDay();
+    if ( wdayDst == wdayThis )
+    {
+        // nothing to do
+        return *this;
     }
-    else
+
+    if ( flags == Default_First )
+    {
+        flags = GetCountry() == USA ? Sunday_First : Monday_First;
+    }
+
+    // the logic below based on comparing weekday and wdayThis works if Sun (0)
+    // is the first day in the week, but breaks down for Monday_First case so
+    // we adjust the week days in this case
+    if ( flags == Monday_First )
+    {
+        if ( wdayThis == Sun )
+            wdayThis += 7;
+        if ( wdayDst == Sun )
+            wdayDst += 7;
+    }
+    //else: Sunday_First, nothing to do
+
+    // go forward or back in time to the day we want
+    if ( wdayDst < wdayThis )
+    {
+        return Subtract(wxDateSpan::Days(wdayThis - wdayDst));
+    }
+    else // weekday > wdayThis
+    {
+        return Add(wxDateSpan::Days(wdayDst - wdayThis));
+    }
+}
+
+wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
+{
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+
+    int diff;
+    WeekDay wdayThis = GetWeekDay();
+    if ( weekday == wdayThis )
+    {
+        // nothing to do
+        return *this;
+    }
+    else if ( weekday < wdayThis )
+    {
+        // need to advance a week
+        diff = 7 - (wdayThis - weekday);
+    }
+    else // weekday > wdayThis
+    {
+        diff = weekday - wdayThis;
+    }
+
+    return Add(wxDateSpan::Days(diff));
+}
+
+wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
+{
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+
+    int diff;
+    WeekDay wdayThis = GetWeekDay();
+    if ( weekday == wdayThis )
+    {
+        // nothing to do
+        return *this;
+    }
+    else if ( weekday > wdayThis )
+    {
+        // need to go to previous week
+        diff = 7 - (weekday - wdayThis);
+    }
+    else // weekday < wdayThis
+    {
+        diff = wdayThis - weekday;
+    }
+
+    return Subtract(wxDateSpan::Days(diff));
+}
+
+bool wxDateTime::SetToWeekDay(WeekDay weekday,
+                              int n,
+                              Month month,
+                              int year)
+{
+    wxCHECK_MSG( weekday != Inv_WeekDay, false, _T("invalid weekday") );
+
+    // we don't check explicitly that -5 <= n <= 5 because we will return false
+    // anyhow in such case - but may be should still give an assert for it?
+
+    // take the current month/year if none specified
+    ReplaceDefaultYearMonthWithCurrent(&year, &month);
+
+    wxDateTime dt;
+
+    // TODO this probably could be optimised somehow...
+
+    if ( n > 0 )
+    {
+        // get the first day of the month
+        dt.Set(1, month, year);
+
+        // get its wday
+        WeekDay wdayFirst = dt.GetWeekDay();
+
+        // go to the first weekday of the month
+        int diff = weekday - wdayFirst;
+        if ( diff < 0 )
+            diff += 7;
+
+        // add advance n-1 weeks more
+        diff += 7*(n - 1);
+
+        dt += wxDateSpan::Days(diff);
+    }
+    else // count from the end of the month
     {
         // get the last day of the month
         dt.SetToLastMonthDay(month, year);
@@ -830,7 +2086,7 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday,
             diff += 7;
 
         // and rewind n-1 weeks from there
-        diff += 7*(n - 1);
+        diff += 7*(-n - 1);
 
         dt -= wxDateSpan::Days(diff);
     }
@@ -840,13 +2096,126 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday,
     {
         *this = dt;
 
-        return TRUE;
+        return true;
     }
     else
     {
         // no such day in this month
-        return FALSE;
+        return false;
+    }
+}
+
+static inline
+wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm)
+{
+    return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday);
+}
+
+wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
+{
+    return GetDayOfYearFromTm(GetTm(tz));
+}
+
+wxDateTime::wxDateTime_t
+wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const
+{
+    if ( flags == Default_First )
+    {
+        flags = GetCountry() == USA ? Sunday_First : Monday_First;
+    }
+
+    Tm tm(GetTm(tz));
+    wxDateTime_t nDayInYear = GetDayOfYearFromTm(tm);
+
+    int wdTarget = GetWeekDay(tz);
+    int wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
+    int week;
+    if ( flags == Sunday_First )
+    {
+        // FIXME: First week is not calculated correctly.
+        week = (nDayInYear - wdTarget + 7) / 7;
+        if ( wdYearStart == Wed || wdYearStart == Thu )
+            week++;
+    }
+    else // week starts with monday
+    {
+        // adjust the weekdays to non-US style.
+        wdYearStart = ConvertWeekDayToMondayBase(wdYearStart);
+        wdTarget = ConvertWeekDayToMondayBase(wdTarget);
+
+        // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html:
+        //
+        //      Week 01 of a year is per definition the first week that has the
+        //      Thursday in this year, which is equivalent to the week that
+        //      contains the fourth day of January. In other words, the first
+        //      week of a new year is the week that has the majority of its
+        //      days in the new year. Week 01 might also contain days from the
+        //      previous year and the week before week 01 of a year is the last
+        //      week (52 or 53) of the previous year even if it contains days
+        //      from the new year. A week starts with Monday (day 1) and ends
+        //      with Sunday (day 7).
+        //
+
+        // if Jan 1 is Thursday or less, it is in the first week of this year
+        if ( wdYearStart < 4 )
+        {
+            // count the number of entire weeks between Jan 1 and this date
+            week = (nDayInYear + wdYearStart + 6 - wdTarget)/7;
+
+            // be careful to check for overflow in the next year
+            if ( week == 53 && tm.mday - wdTarget > 28 )
+                    week = 1;
+        }
+        else // Jan 1 is in the last week of the previous year
+        {
+            // check if we happen to be at the last week of previous year:
+            if ( tm.mon == Jan && tm.mday < 8 - wdYearStart )
+                week = wxDateTime(31, Dec, GetYear()-1).GetWeekOfYear();
+            else
+                week = (nDayInYear + wdYearStart - 1 - wdTarget)/7;
+        }
+    }
+
+    return (wxDateTime::wxDateTime_t)week;
+}
+
+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)
+{
+    int year = GetYear();
+    wxDATETIME_CHECK( (0 < yday) && (yday <= GetNumberOfDays(year)),
+                      _T("invalid year day") );
+
+    bool isLeap = IsLeapYear(year);
+    for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) )
+    {
+        // 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((wxDateTime::wxDateTime_t)(yday - gs_cumulatedDays[isLeap][mon]), mon, year);
+
+            break;
+        }
     }
+
+    return *this;
 }
 
 // ----------------------------------------------------------------------------
@@ -855,15 +2224,7 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday,
 
 double wxDateTime::GetJulianDayNumber() const
 {
-    Tm tm(GetTm());
-
-    double result = GetTruncatedJDN(tm.mday, tm.mon, tm.year);
-
-    // add the part GetTruncatedJDN() neglected
-    result += 0.5;
-
-    // and now add the time: 86400 sec = 1 JDN
-    return result + ((double)(60*(60*tm.hour + tm.min) + tm.sec)) / 86400;
+    return m_time.ToDouble() / MILLISECONDS_PER_DAY + EPOCH_JDN + 0.5;
 }
 
 double wxDateTime::GetRataDie() const
@@ -873,174 +2234,2358 @@ double wxDateTime::GetRataDie() const
 }
 
 // ----------------------------------------------------------------------------
-// timezone stuff
+// timezone and DST stuff
 // ----------------------------------------------------------------------------
 
-wxDateTime& wxDateTime::MakeUTC()
+int wxDateTime::IsDST(wxDateTime::Country country) const
 {
-    return Add(wxTimeSpan::Seconds(GetTimeZone()));
+    wxCHECK_MSG( country == Country_Default, -1,
+                 _T("country support not implemented") );
+
+    // use the C RTL for the dates in the standard range
+    time_t timet = GetTicks();
+    if ( timet != (time_t)-1 )
+    {
+        struct tm tmstruct;
+        tm *tm = wxLocaltime_r(&timet, &tmstruct);
+
+        wxCHECK_MSG( tm, -1, _T("wxLocaltime_r() failed") );
+
+        return tm->tm_isdst;
+    }
+    else
+    {
+        int year = GetYear();
+
+        if ( !IsDSTApplicable(year, country) )
+        {
+            // no DST time in this year in this country
+            return -1;
+        }
+
+        return IsBetween(GetBeginDST(year, country), GetEndDST(year, country));
+    }
 }
 
-wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz)
+wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
 {
-    int minDiff = GetTimeZone() / SECONDS_IN_MINUTE + tz.GetOffset();
-    return Add(wxTimeSpan::Minutes(minDiff));
+    long secDiff = GetTimeZone() + tz.GetOffset();
+
+    // we need to know whether DST is or not in effect for this date unless
+    // the test disabled by the caller
+    if ( !noDST && (IsDST() == 1) )
+    {
+        // FIXME we assume that the DST is always shifted by 1 hour
+        secDiff -= 3600;
+    }
+
+    return Add(wxTimeSpan::Seconds(secDiff));
 }
 
-wxDateTime& wxDateTime::MakeLocalTime(const TimeZone& tz)
+wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
 {
-    int minDiff = GetTimeZone() / SECONDS_IN_MINUTE + tz.GetOffset();
-    return Substract(wxTimeSpan::Minutes(minDiff));
+    long secDiff = GetTimeZone() + tz.GetOffset();
+
+    // we need to know whether DST is or not in effect for this date unless
+    // the test disabled by the caller
+    if ( !noDST && (IsDST() == 1) )
+    {
+        // FIXME we assume that the DST is always shifted by 1 hour
+        secDiff -= 3600;
+    }
+
+    return Subtract(wxTimeSpan::Seconds(secDiff));
 }
 
 // ----------------------------------------------------------------------------
 // wxDateTime to/from text representations
 // ----------------------------------------------------------------------------
 
-wxString wxDateTime::Format(const wxChar *format) const
+wxString wxDateTime::Format(const wxString& format, const TimeZone& tz) const
 {
-    wxCHECK_MSG( format, _T(""), _T("NULL format in wxDateTime::Format") );
+    wxCHECK_MSG( !format.empty(), wxEmptyString,
+                 _T("NULL format in wxDateTime::Format") );
 
+    // we have to use our own implementation if the date is out of range of
+    // strftime() or if we use non standard specificators
+#ifdef HAVE_STRFTIME
     time_t time = GetTicks();
-    if ( time != (time_t)-1 )
+
+    if ( (time != (time_t)-1) && !wxStrstr(format, _T("%l")) )
     {
         // use strftime()
-        tm *tm = localtime(&time);
+        struct tm tmstruct;
+        struct tm *tm;
+        if ( tz.GetOffset() == -GetTimeZone() )
+        {
+            // we are working with local time
+            tm = wxLocaltime_r(&time, &tmstruct);
+
+            // should never happen
+            wxCHECK_MSG( tm, wxEmptyString, _T("wxLocaltime_r() failed") );
+        }
+        else
+        {
+            time += (int)tz.GetOffset();
+
+#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
+            int time2 = (int) time;
+            if ( time2 >= 0 )
+#else
+            if ( time >= 0 )
+#endif
+            {
+                tm = wxGmtime_r(&time, &tmstruct);
 
-        // should never happen
-        wxCHECK_MSG( tm, _T(""), _T("localtime() failed") );
+                // should never happen
+                wxCHECK_MSG( tm, wxEmptyString, _T("wxGmtime_r() failed") );
+            }
+            else
+            {
+                tm = (struct tm *)NULL;
+            }
+        }
 
-        return CallStrftime(format, tm);
+        if ( tm )
+        {
+            return CallStrftime(format, tm);
+        }
     }
-    else
+    //else: use generic code below
+#endif // HAVE_STRFTIME
+
+    // we only parse ANSI C format specifications here, no POSIX 2
+    // 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
+    struct tm tmTimeOnly;
+    tmTimeOnly.tm_hour = tm.hour;
+    tmTimeOnly.tm_min = tm.min;
+    tmTimeOnly.tm_sec = tm.sec;
+    tmTimeOnly.tm_wday = 0;
+    tmTimeOnly.tm_yday = 0;
+    tmTimeOnly.tm_mday = 1;         // any date will do
+    tmTimeOnly.tm_mon = 0;
+    tmTimeOnly.tm_year = 76;
+    tmTimeOnly.tm_isdst = 0;        // no DST, we adjust for tz ourselves
+
+    wxString tmp, res, fmt;
+    for ( wxString::const_iterator p = format.begin(); p != format.end(); ++p )
     {
-        // use a hack and still use strftime(): 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 where YEAR is any year
-        // in the range supported by strftime() (1970 - 2037) which is equal to
-        // the real year modulo 28 (so the week days coincide for them)
-
-        // find the YEAR
-        int yearReal = GetYear();
-        int year = 1970 + yearReal % 28;
-
-        wxString strYear;
-        strYear.Printf(_T("%d"), year);
-
-        // find a string 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 )
+        if ( *p != _T('%') )
         {
-            replacement << (wxChar)-1;
+            // copy as is
+            res += *p;
+
+            continue;
         }
 
-        // replace all occurences of year with it
-        bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
+        // set the default format
+        switch ( (*++p).GetValue() )
+        {
+            case _T('Y'):               // year has 4 digits
+                fmt = _T("%04d");
+                break;
+
+            case _T('j'):               // day of year has 3 digits
+            case _T('l'):               // milliseconds have 3 digits
+                fmt = _T("%03d");
+                break;
+
+            case _T('w'):               // week day as number has only one
+                fmt = _T("%d");
+                break;
+
+            default:
+                // it's either another valid format specifier in which case
+                // the format is "%02d" (for all the rest) or we have the
+                // field width preceding the format in which case it will
+                // override the default format anyhow
+                fmt = _T("%02d");
+        }
 
-        // use strftime() to format the same date but in supported year
-        wxDateTime dt(*this);
-        dt.SetYear(year);
-        wxString str = dt.Format(format);
+        bool restart = true;
+        while ( restart )
+        {
+            restart = false;
 
-        // now replace the occurence of 1999 with the real year
-        wxString strYearReal;
-        strYearReal.Printf(_T("%d"), yearReal);
-        str.Replace(strYear, strYearReal);
+            // start of the format specification
+            switch ( (*p).GetValue() )
+            {
+                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;
 
-        // and replace back all occurences of replacement string
-        if ( wasReplaced )
-            str.Replace(replacement, strYear);
+                case _T('b'):       // a month name
+                case _T('B'):
+                    res += GetMonthName(tm.mon,
+                                        *p == _T('b') ? Name_Abbr : Name_Full);
+                    break;
 
-        return str;
-    }
-}
+                case _T('c'):       // locale default date and time  representation
+                case _T('x'):       // locale default date representation
+#ifdef HAVE_STRFTIME
+                    //
+                    // 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 occurrences of YEAR in it with some unique
+                    // string not appearing anywhere else in it, then use
+                    // strftime() to format the date in year YEAR and then replace
+                    // YEAR back by the real year and the unique replacement
+                    // string back with YEAR. Notice that "all occurrences of YEAR"
+                    // means all occurrences of 4 digit as well as 2 digit form!
+                    //
+                    // the bugs: we assume that neither of %c nor %x contains any
+                    // fields which may change between the YEAR and real year. For
+                    // 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 of 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;
+
+                        // 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;
+                        }
+
+                        // finally move the year below 2000 so that the 2-digit
+                        // year number can never match the month or day of the
+                        // month when we do the replacements below
+                        if ( year >= 2000 )
+                            year -= 28;
+
+                        wxASSERT_MSG( year >= 1970 && year < 2000,
+                                      _T("logic error in wxDateTime::Format") );
+
+
+                        // 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 replacement year with the real year:
+                        // notice that we have to replace the 4 digit year with
+                        // a unique string not appearing in strftime() output
+                        // first to prevent the 2 digit year from matching any
+                        // substring of the 4 digit year (but any day, month,
+                        // hours or minutes components should be safe because
+                        // they are never in 70-99 range)
+                        wxString replacement("|");
+                        while ( str.find(replacement) != wxString::npos )
+                            replacement += '|';
+
+                        str.Replace(wxString::Format("%d", year),
+                                    replacement);
+                        str.Replace(wxString::Format("%d", year % 100),
+                                    wxString::Format("%d", yearReal % 100));
+                        str.Replace(replacement,
+                                    wxString::Format("%d", yearReal));
+
+                        res += str;
+                    }
+#else // !HAVE_STRFTIME
+                    // Use "%m/%d/%y %H:%M:%S" format instead
+                    res += wxString::Format(wxT("%02d/%02d/%04d %02d:%02d:%02d"),
+                            tm.mon+1,tm.mday, tm.year, tm.hour, tm.min, tm.sec);
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+                    break;
 
-// ============================================================================
-// wxTimeSpan
-// ============================================================================
+                case _T('d'):       // day of a month (01-31)
+                    res += wxString::Format(fmt, tm.mday);
+                    break;
 
-// not all strftime(3) format specifiers make sense here because, for example,
-// a time span doesn't have a year nor a timezone
-//
-// Here are the ones which are supported (all of them are supported by strftime
-// as well):
-//  %H          hour in 24 hour format
-//  %M          minute (00 - 59)
-//  %S          second (00 - 59)
-//  %%          percent sign
-//
-// Also, for MFC CTimeSpan compatibility, we support
-//  %D          number of days
-//
-// And, to be better than MFC :-), we also have
-//  %E          number of wEeks
-//  %l          milliseconds (000 - 999)
-wxString wxTimeSpan::Format(const wxChar *format) const
-{
-    wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") );
+                case _T('H'):       // hour in 24h format (00-23)
+                    res += wxString::Format(fmt, tm.hour);
+                    break;
 
-    wxString str;
-    str.Alloc(strlen(format));
+                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;
 
-    for ( const wxChar *pch = format; pch; pch++ )
-    {
-        wxChar ch = *pch;
+                case _T('j'):       // day of the year
+                    res += wxString::Format(fmt, GetDayOfYear(tz));
+                    break;
 
-        if ( ch == '%' )
-        {
-            wxString tmp;
+                case _T('l'):       // milliseconds (NOT STANDARD)
+                    res += wxString::Format(fmt, GetMillisecond(tz));
+                    break;
 
-            ch = *pch++;
-            switch ( ch )
-            {
-                default:
-                    wxFAIL_MSG( _T("invalid format character") );
-                    // fall through
+                case _T('m'):       // month as a number (01-12)
+                    res += wxString::Format(fmt, tm.mon + 1);
+                    break;
 
-                case '%':
-                    // will get to str << ch below
+                case _T('M'):       // minute as a decimal number (00-59)
+                    res += wxString::Format(fmt, tm.min);
                     break;
 
-                case 'D':
-                    tmp.Printf(_T("%d"), GetDays());
+                case _T('p'):       // AM or PM string
+#ifdef HAVE_STRFTIME
+                    res += CallStrftime(_T("%p"), &tmTimeOnly);
+#else // !HAVE_STRFTIME
+                    res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
                     break;
 
-                case 'E':
-                    tmp.Printf(_T("%d"), GetWeeks());
+                case _T('S'):       // second as a decimal number (00-61)
+                    res += wxString::Format(fmt, tm.sec);
                     break;
 
-                case 'H':
-                    tmp.Printf(_T("%02d"), GetHours());
+                case _T('U'):       // week number in the year (Sunday 1st week day)
+                    res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
                     break;
 
-                case 'l':
-                    tmp.Printf(_T("%03d"), GetMilliseconds());
+                case _T('W'):       // week number in the year (Monday 1st week day)
+                    res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz));
                     break;
 
-                case 'M':
-                    tmp.Printf(_T("%02d"), GetMinutes());
+                case _T('w'):       // weekday as a number (0-6), Sunday = 0
+                    res += wxString::Format(fmt, tm.GetWeekDay());
                     break;
 
-                case 'S':
-                    tmp.Printf(_T("%02d"), GetSeconds());
+                // case _T('x'): -- handled with "%c"
+
+                case _T('X'):       // locale default time representation
+                    // just use strftime() to format the time for us
+#ifdef HAVE_STRFTIME
+                    res += CallStrftime(_T("%X"), &tmTimeOnly);
+#else // !HAVE_STRFTIME
+                    res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec);
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
                     break;
-            }
 
-            if ( !!tmp )
-            {
-                str += tmp;
+                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('Z'):       // timezone name
+#ifdef HAVE_STRFTIME
+                    res += CallStrftime(_T("%Z"), &tmTimeOnly);
+#endif
+                    break;
+
+                default:
+                    // is it the format width?
+                    fmt.Empty();
+                    while ( *p == _T('-') || *p == _T('+') ||
+                            *p == _T(' ') || wxIsdigit(*p) )
+                    {
+                        fmt += *p;
+                    }
+
+                    if ( !fmt.empty() )
+                    {
+                        // we've only got the flags and width so far in fmt
+                        fmt.Prepend(_T('%'));
+                        fmt.Append(_T('d'));
+
+                        restart = true;
+
+                        break;
+                    }
+
+                    // no, it wasn't the width
+                    wxFAIL_MSG(_T("unknown format specificator"));
+
+                    // fall through and just copy it nevertheless
 
-                // skip str += ch below
-                continue;
+                case _T('%'):       // a percent sign
+                    res += *p;
+                    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;
             }
         }
-
-        str += ch;
     }
 
-    return str;
+    return res;
 }
+
+// this function parses a string in (strict) RFC 822 format: see the section 5
+// of the RFC for the detailed description, but briefly it's something of the
+// form "Sat, 18 Dec 1999 00:48:30 +0100"
+//
+// this function is "strict" by design - it must reject anything except true
+// RFC822 time specs.
+//
+// TODO a great candidate for using reg exps
+const char *
+wxDateTime::ParseRfc822Date(const wxString& date, wxString::const_iterator *end)
+{
+    // TODO: rewrite using iterators instead of wxChar pointers
+    const wxStringCharType *p = date.wx_str();
+    const wxStringCharType *comma = wxStrchr(p, wxS(','));
+    if ( comma )
+    {
+        // the part before comma is the weekday
+
+        // skip it for now - we don't use but might check that it really
+        // corresponds to the specfied date
+        p = comma + 1;
+
+        if ( *p != _T(' ') )
+        {
+            wxLogDebug(_T("no space after weekday in RFC822 time spec"));
+
+            return NULL;
+        }
+
+        p++; // skip space
+    }
+
+    // the following 1 or 2 digits are the day number
+    if ( !wxIsdigit(*p) )
+    {
+        wxLogDebug(_T("day number expected in RFC822 time spec, none found"));
+
+        return NULL;
+    }
+
+    wxDateTime_t day = (wxDateTime_t)(*p++ - _T('0'));
+    if ( wxIsdigit(*p) )
+    {
+        day *= 10;
+        day = (wxDateTime_t)(day + (*p++ - _T('0')));
+    }
+
+    if ( *p++ != _T(' ') )
+    {
+        return NULL;
+    }
+
+    // the following 3 letters specify the month
+    wxString monName(p, 3);
+    Month mon;
+    if ( monName == _T("Jan") )
+        mon = Jan;
+    else if ( monName == _T("Feb") )
+        mon = Feb;
+    else if ( monName == _T("Mar") )
+        mon = Mar;
+    else if ( monName == _T("Apr") )
+        mon = Apr;
+    else if ( monName == _T("May") )
+        mon = May;
+    else if ( monName == _T("Jun") )
+        mon = Jun;
+    else if ( monName == _T("Jul") )
+        mon = Jul;
+    else if ( monName == _T("Aug") )
+        mon = Aug;
+    else if ( monName == _T("Sep") )
+        mon = Sep;
+    else if ( monName == _T("Oct") )
+        mon = Oct;
+    else if ( monName == _T("Nov") )
+        mon = Nov;
+    else if ( monName == _T("Dec") )
+        mon = Dec;
+    else
+    {
+        wxLogDebug(_T("Invalid RFC 822 month name '%s'"), monName.c_str());
+
+        return NULL;
+    }
+
+    p += 3;
+
+    if ( *p++ != _T(' ') )
+    {
+        return NULL;
+    }
+
+    // next is the year
+    if ( !wxIsdigit(*p) )
+    {
+        // no year?
+        return NULL;
+    }
+
+    int year = *p++ - _T('0');
+
+    if ( !wxIsdigit(*p) )
+    {
+        // should have at least 2 digits in the year
+        return NULL;
+    }
+
+    year *= 10;
+    year += *p++ - _T('0');
+
+    // is it a 2 digit year (as per original RFC 822) or a 4 digit one?
+    if ( wxIsdigit(*p) )
+    {
+        year *= 10;
+        year += *p++ - _T('0');
+
+        if ( !wxIsdigit(*p) )
+        {
+            // no 3 digit years please
+            return NULL;
+        }
+
+        year *= 10;
+        year += *p++ - _T('0');
+    }
+
+    if ( *p++ != _T(' ') )
+    {
+        return NULL;
+    }
+
+    // time is in the format hh:mm:ss and seconds are optional
+    if ( !wxIsdigit(*p) )
+    {
+        return NULL;
+    }
+
+    wxDateTime_t hour = (wxDateTime_t)(*p++ - _T('0'));
+
+    if ( !wxIsdigit(*p) )
+    {
+        return NULL;
+    }
+
+    hour *= 10;
+    hour = (wxDateTime_t)(hour + (*p++ - _T('0')));
+
+    if ( *p++ != _T(':') )
+    {
+        return NULL;
+    }
+
+    if ( !wxIsdigit(*p) )
+    {
+        return NULL;
+    }
+
+    wxDateTime_t min = (wxDateTime_t)(*p++ - _T('0'));
+
+    if ( !wxIsdigit(*p) )
+    {
+        return NULL;
+    }
+
+    min *= 10;
+    min = (wxDateTime_t)(min + *p++ - _T('0'));
+
+    wxDateTime_t sec = 0;
+    if ( *p++ == _T(':') )
+    {
+        if ( !wxIsdigit(*p) )
+        {
+            return NULL;
+        }
+
+        sec = (wxDateTime_t)(*p++ - _T('0'));
+
+        if ( !wxIsdigit(*p) )
+        {
+            return NULL;
+        }
+
+        sec *= 10;
+        sec = (wxDateTime_t)(sec + *p++ - _T('0'));
+    }
+
+    if ( *p++ != _T(' ') )
+    {
+        return NULL;
+    }
+
+    // and now the interesting part: the timezone
+    int offset wxDUMMY_INITIALIZE(0);
+    if ( *p == _T('-') || *p == _T('+') )
+    {
+        // the explicit offset given: it has the form of hhmm
+        bool plus = *p++ == _T('+');
+
+        if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
+        {
+            return NULL;
+        }
+
+        // hours
+        offset = MIN_PER_HOUR*(10*(*p - _T('0')) + (*(p + 1) - _T('0')));
+
+        p += 2;
+
+        if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
+        {
+            return NULL;
+        }
+
+        // minutes
+        offset += 10*(*p - _T('0')) + (*(p + 1) - _T('0'));
+
+        if ( !plus )
+        {
+            offset = -offset;
+        }
+
+        p += 2;
+    }
+    else
+    {
+        // the symbolic timezone given: may be either military timezone or one
+        // of standard abbreviations
+        if ( !*(p + 1) )
+        {
+            // military: Z = UTC, J unused, A = -1, ..., Y = +12
+            static const int offsets[26] =
+            {
+                //A  B   C   D   E   F   G   H   I    J    K    L    M
+                -1, -2, -3, -4, -5, -6, -7, -8, -9,   0, -10, -11, -12,
+                //N  O   P   R   Q   S   T   U   V    W    Z    Y    Z
+                +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, 0
+            };
+
+            if ( *p < _T('A') || *p > _T('Z') || *p == _T('J') )
+            {
+                wxLogDebug(_T("Invalid militaty timezone '%c'"), *p);
+
+                return NULL;
+            }
+
+            offset = offsets[*p++ - _T('A')];
+        }
+        else
+        {
+            // abbreviation
+            wxString tz = p;
+            if ( tz == _T("UT") || tz == _T("UTC") || tz == _T("GMT") )
+                offset = 0;
+            else if ( tz == _T("AST") )
+                offset = AST - GMT0;
+            else if ( tz == _T("ADT") )
+                offset = ADT - GMT0;
+            else if ( tz == _T("EST") )
+                offset = EST - GMT0;
+            else if ( tz == _T("EDT") )
+                offset = EDT - GMT0;
+            else if ( tz == _T("CST") )
+                offset = CST - GMT0;
+            else if ( tz == _T("CDT") )
+                offset = CDT - GMT0;
+            else if ( tz == _T("MST") )
+                offset = MST - GMT0;
+            else if ( tz == _T("MDT") )
+                offset = MDT - GMT0;
+            else if ( tz == _T("PST") )
+                offset = PST - GMT0;
+            else if ( tz == _T("PDT") )
+                offset = PDT - GMT0;
+            else
+            {
+                wxLogDebug(_T("Unknown RFC 822 timezone '%s'"), p);
+
+                return NULL;
+            }
+
+            p += tz.length();
+        }
+
+        // make it minutes
+        offset *= MIN_PER_HOUR;
+    }
+
+    // the spec was correct, construct the date from the values we found
+    Set(day, mon, year, hour, min, sec);
+    MakeFromTimezone(TimeZone::Make(offset*SEC_PER_MIN));
+
+    const size_t endpos = p - date.wx_str();
+    if ( end )
+        *end = date.begin() + endpos;
+
+    return date.c_str() + endpos;
+}
+
+#ifdef __WINDOWS__
+
+// returns the string containing strftime() format used for short dates in the
+// current locale or an empty string
+static wxString GetLocaleDateFormat()
+{
+    wxString fmtWX;
+
+    // there is no setlocale() under Windows CE, so just always query the
+    // system there
+#ifndef __WXWINCE__
+    if ( strcmp(setlocale(LC_ALL, NULL), "C") != 0 )
+#endif
+    {
+        // The locale was programatically set to non-C. We assume that this was
+        // done using wxLocale, in which case thread's current locale is also
+        // set to correct LCID value and we can use GetLocaleInfo to determine
+        // the correct formatting string:
+#ifdef __WXWINCE__
+        LCID lcid = LOCALE_USER_DEFAULT;
+#else
+        LCID lcid = GetThreadLocale();
+#endif
+        // according to MSDN 80 chars is max allowed for short date format
+        wxChar fmt[81];
+        if ( ::GetLocaleInfo(lcid, LOCALE_SSHORTDATE, fmt, WXSIZEOF(fmt)) )
+        {
+            wxChar chLast = _T('\0');
+            size_t lastCount = 0;
+            for ( const wxChar *p = fmt; /* NUL handled inside */; p++ )
+            {
+                if ( *p == chLast )
+                {
+                    lastCount++;
+                    continue;
+                }
+
+                switch ( *p )
+                {
+                    // these characters come in groups, start counting them
+                    case _T('d'):
+                    case _T('M'):
+                    case _T('y'):
+                    case _T('g'):
+                        chLast = *p;
+                        lastCount = 1;
+                        break;
+
+                    default:
+                        // first deal with any special characters we have had
+                        if ( lastCount )
+                        {
+                            switch ( chLast )
+                            {
+                                case _T('d'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // d
+                                        case 2: // dd
+                                            // these two are the same as we
+                                            // don't distinguish between 1 and
+                                            // 2 digits for days
+                                            fmtWX += _T("%d");
+                                            break;
+
+                                        case 3: // ddd
+                                            fmtWX += _T("%a");
+                                            break;
+
+                                        case 4: // dddd
+                                            fmtWX += _T("%A");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("too many 'd's") );
+                                    }
+                                    break;
+
+                                case _T('M'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // M
+                                        case 2: // MM
+                                            // as for 'd' and 'dd' above
+                                            fmtWX += _T("%m");
+                                            break;
+
+                                        case 3:
+                                            fmtWX += _T("%b");
+                                            break;
+
+                                        case 4:
+                                            fmtWX += _T("%B");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("too many 'M's") );
+                                    }
+                                    break;
+
+                                case _T('y'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // y
+                                        case 2: // yy
+                                            fmtWX += _T("%y");
+                                            break;
+
+                                        case 4: // yyyy
+                                            fmtWX += _T("%Y");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("wrong number of 'y's") );
+                                    }
+                                    break;
+
+                                case _T('g'):
+                                    // strftime() doesn't have era string,
+                                    // ignore this format
+                                    wxASSERT_MSG( lastCount <= 2,
+                                                  _T("too many 'g's") );
+                                    break;
+
+                                default:
+                                    wxFAIL_MSG( _T("unreachable") );
+                            }
+
+                            chLast = _T('\0');
+                            lastCount = 0;
+                        }
+
+                        // not a special character so must be just a separator,
+                        // treat as is
+                        if ( *p != _T('\0') )
+                        {
+                            if ( *p == _T('%') )
+                            {
+                                // this one needs to be escaped
+                                fmtWX += _T('%');
+                            }
+
+                            fmtWX += *p;
+                        }
+                }
+
+                if ( *p == _T('\0') )
+                    break;
+            }
+        }
+        //else: GetLocaleInfo() failed, leave fmtDate value unchanged and
+        //      try our luck with the default formats
+    }
+    //else: default C locale, default formats should work
+
+    return fmtWX;
+}
+
+#endif // __WINDOWS__
+
+const char *
+wxDateTime::ParseFormat(const wxString& date,
+                        const wxString& format,
+                        const wxDateTime& dateDef,
+                        wxString::const_iterator *end)
+{
+    wxCHECK_MSG( !format.empty(), NULL, "format can't be empty" );
+
+    wxString str;
+    unsigned long num;
+
+    // what fields have we found?
+    bool haveWDay = false,
+         haveYDay = false,
+         haveDay = false,
+         haveMon = false,
+         haveYear = false,
+         haveHour = false,
+         haveMin = false,
+         haveSec = false;
+
+    bool hourIsIn12hFormat = false, // or in 24h one?
+         isPM = false;              // AM by default
+
+    // 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 wxStringCharType *input = date.wx_str();
+    for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++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 NULL;
+                }
+            }
+
+            // done with this format char
+            continue;
+        }
+
+        // start of a format specification
+
+        // parse the optional width
+        size_t width = 0;
+        while ( wxIsdigit(*++fmt) )
+        {
+            width *= 10;
+            width += *fmt - _T('0');
+        }
+
+        // the default widths for the various fields
+        if ( !width )
+        {
+            switch ( (*fmt).GetValue() )
+            {
+                case _T('Y'):               // year has 4 digits
+                    width = 4;
+                    break;
+
+                case _T('j'):               // day of year has 3 digits
+                case _T('l'):               // milliseconds have 3 digits
+                    width = 3;
+                    break;
+
+                case _T('w'):               // week day as number has only one
+                    width = 1;
+                    break;
+
+                default:
+                    // default for all other fields
+                    width = 2;
+            }
+        }
+
+        // then the format itself
+        switch ( (*fmt).GetValue() )
+        {
+            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 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 NULL;
+                    }
+                }
+                haveMon = true;
+                break;
+
+            case _T('c'):       // locale default date and time  representation
+                {
+                    wxDateTime dt;
+
+                    const wxString inc(input);
+
+                    // try the format which corresponds to ctime() output first
+                    wxString::const_iterator endc;
+                    if ( !dt.ParseFormat(inc, wxS("%a %b %d %H:%M:%S %Y"), &endc) &&
+                            !dt.ParseFormat(inc, wxS("%x %X"), &endc) &&
+                                !dt.ParseFormat(inc, wxS("%X %x"), &endc) )
+                    {
+                        // we've tried everything and still no match
+                        return 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 += endc - inc.begin();
+                }
+                break;
+
+            case _T('d'):       // day of a month (01-31)
+                if ( !GetNumericToken(width, input, &num) ||
+                        (num > 31) || (num < 1) )
+                {
+                    // no match
+                    return 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(width, input, &num) || (num > 23) )
+                {
+                    // no match
+                    return NULL;
+                }
+
+                haveHour = true;
+                hour = (wxDateTime_t)num;
+                break;
+
+            case _T('I'):       // hour in 12h format (01-12)
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
+                {
+                    // no match
+                    return NULL;
+                }
+
+                haveHour = true;
+                hourIsIn12hFormat = true;
+                hour = (wxDateTime_t)(num % 12);        // 12 should be 0
+                break;
+
+            case _T('j'):       // day of the year
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 366) )
+                {
+                    // no match
+                    return NULL;
+                }
+
+                haveYDay = true;
+                yday = (wxDateTime_t)num;
+                break;
+
+            case _T('m'):       // month as a number (01-12)
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
+                {
+                    // no match
+                    return NULL;
+                }
+
+                haveMon = true;
+                mon = (Month)(num - 1);
+                break;
+
+            case _T('M'):       // minute as a decimal number (00-59)
+                if ( !GetNumericToken(width, input, &num) || (num > 59) )
+                {
+                    // no match
+                    return 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 (am.empty() && pm.empty())
+                        return NULL;  // no am/pm strings defined
+                    if ( token.CmpNoCase(pm) == 0 )
+                    {
+                        isPM = true;
+                    }
+                    else if ( token.CmpNoCase(am) != 0 )
+                    {
+                        // no match
+                        return NULL;
+                    }
+                }
+                break;
+
+            case _T('r'):       // time as %I:%M:%S %p
+                {
+                    wxDateTime dt;
+                    input = dt.ParseFormat(input, wxS("%I:%M:%S %p"));
+                    if ( !input )
+                    {
+                        // no match
+                        return 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, wxS("%H:%M"));
+                    if ( !input )
+                    {
+                        // no match
+                        return NULL;
+                    }
+
+                    haveHour = haveMin = true;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                }
+                break;
+
+            case _T('S'):       // second as a decimal number (00-61)
+                if ( !GetNumericToken(width, input, &num) || (num > 61) )
+                {
+                    // no match
+                    return 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 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(width, input, &num) || (wday > 6) )
+                {
+                    // no match
+                    return 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
+                {
+                    struct tm tm;
+
+                    const wxStringCharType *
+                        result = CallStrptime(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
+
+                {
+                    wxDateTime dt;
+                    wxString fmtDate,
+                             fmtDateAlt;
+
+#ifdef __WINDOWS__
+                    // The above doesn't work for all locales, try to query
+                    // Windows for the right way of formatting the date:
+                    fmtDate = GetLocaleDateFormat();
+                    if ( fmtDate.empty() )
+#endif // __WINDOWS__
+                    {
+                        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 wxString indate(input);
+                    wxString::const_iterator endDate;
+                    if ( !dt.ParseFormat(indate, fmtDate, &endDate) )
+                    {
+                        // try another one if we have it
+                        if ( fmtDateAlt.empty() ||
+                                !dt.ParseFormat(indate, fmtDateAlt, &endDate) )
+                        {
+                            return NULL;
+                        }
+                    }
+
+                    Tm tm = dt.GetTm();
+
+                    haveDay =
+                    haveMon =
+                    haveYear = true;
+
+                    year = tm.year;
+                    mon = tm.mon;
+                    mday = tm.mday;
+
+                    input += endDate - indate.begin();
+                }
+
+                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 = CallStrptime(input, "%X", &tm);
+                    if ( !input )
+                    {
+                        return 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 wxStringCharType *
+                        result = dt.ParseFormat(input, wxS("%T"));
+                    if ( !result )
+                    {
+                        result = dt.ParseFormat(input, wxS("%r"));
+                    }
+
+                    if ( !result )
+                    {
+                        // no match
+                        return 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(width, input, &num) || (num > 99) )
+                {
+                    // no match
+                    return NULL;
+                }
+
+                haveYear = true;
+
+                // 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
+                if ( !GetNumericToken(width, input, &num) )
+                {
+                    // no match
+                    return 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 NULL;
+                }
+                break;
+
+            case 0:             // the end of string
+                wxFAIL_MSG(_T("unexpected format end"));
+
+                // fall through
+
+            default:            // not a known format spec
+                return 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 ( IsValid() )
+    {
+        // 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 NULL;
+        }
+
+        tm.mon = mon;
+        tm.mday = mday;
+    }
+    else if ( haveYDay )
+    {
+        if ( yday > GetNumberOfDays(tm.year) )
+        {
+            wxLogDebug(_T("bad year day in wxDateTime::ParseFormat"));
+
+            return 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);
+
+    // finally check that the week day is consistent -- if we had it
+    if ( haveWDay && GetWeekDay() != wday )
+    {
+        wxLogDebug(_T("inconsistsnet week day in wxDateTime::ParseFormat()"));
+
+        return NULL;
+    }
+
+    const size_t endpos = input - date.wx_str();
+    if ( end )
+        *end = date.begin() + endpos;
+
+    return date.c_str() + endpos;
+}
+
+const char *
+wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end)
+{
+    // Set to current day and hour, so strings like '14:00' becomes today at
+    // 14, not some other random date
+    wxDateTime dtDate = wxDateTime::Today();
+    wxDateTime dtTime = wxDateTime::Today();
+
+    wxString::const_iterator
+        endTime,
+        endDate,
+        endBoth;
+
+    // If we got a date in the beginning, see if there is a time specified
+    // after the date
+    if ( dtDate.ParseDate(date, &endDate) )
+    {
+        // Skip spaces, as the ParseTime() function fails on spaces
+        while ( endDate != date.end() && wxIsspace(*endDate) )
+            ++endDate;
+
+        const wxString timestr(endDate, date.end());
+        if ( !dtTime.ParseTime(timestr, &endTime) )
+            return NULL;
+
+        endBoth = endDate + (endTime - timestr.begin());
+    }
+    else // no date in the beginning
+    {
+        // check if we have a time followed by a date
+        if ( !dtTime.ParseTime(date, &endTime) )
+            return NULL;
+
+        while ( endTime != date.end() && wxIsspace(*endTime) )
+            ++endTime;
+
+        const wxString datestr(endTime, date.end());
+        if ( !dtDate.ParseDate(datestr, &endDate) )
+            return NULL;
+
+        endBoth = endTime + (endDate - datestr.begin());
+    }
+
+    Set(dtDate.GetDay(), dtDate.GetMonth(), dtDate.GetYear(),
+        dtTime.GetHour(), dtTime.GetMinute(), dtTime.GetSecond(),
+        dtTime.GetMillisecond());
+
+    // Return endpoint of scan
+    if ( end )
+        *end = endBoth;
+
+    return date.c_str() + (endBoth - date.begin());
+}
+
+const char *
+wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
+{
+    // this is a simplified version of ParseDateTime() which understands only
+    // "today" (for wxDate compatibility) and digits only otherwise (and not
+    // all esoteric constructions ParseDateTime() knows about)
+
+    const wxStringCharType *p = date.wx_str();
+    while ( wxIsspace(*p) )
+        p++;
+
+    // some special cases
+    static struct
+    {
+        const char *str;
+        int dayDiffFromToday;
+    } literalDates[] =
+    {
+        { wxTRANSLATE("today"),             0 },
+        { wxTRANSLATE("yesterday"),        -1 },
+        { wxTRANSLATE("tomorrow"),          1 },
+    };
+
+    for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ )
+    {
+        const wxString dateStr = wxGetTranslation(literalDates[n].str);
+        size_t len = dateStr.length();
+        if ( wxStrlen(p) >= len )
+        {
+            wxString str(p, len);
+            if ( str.CmpNoCase(dateStr) == 0 )
+            {
+                // nothing can follow this, so stop here
+                p += len;
+
+                int dayDiffFromToday = literalDates[n].dayDiffFromToday;
+                *this = Today();
+                if ( dayDiffFromToday )
+                {
+                    *this += wxDateSpan::Days(dayDiffFromToday);
+                }
+
+                const size_t endpos = p - date.wx_str();
+
+                if ( end )
+                    *end = date.begin() + endpos;
+                return date.c_str() + endpos;
+            }
+        }
+    }
+
+    // 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?
+         haveMon = false,       // the month?
+         haveYear = false;      // the year?
+
+    // and the value of the items we have (init them to get rid of warnings)
+    WeekDay wday = Inv_WeekDay;
+    wxDateTime_t day = 0;
+    wxDateTime::Month mon = Inv_Month;
+    int year = 0;
+
+    // tokenize the string
+    size_t nPosCur = 0;
+    static const wxStringCharType *dateDelimiters = wxS(".,/-\t\r\n ");
+    wxStringTokenizer tok(p, dateDelimiters);
+    while ( tok.HasMoreTokens() )
+    {
+        wxString token = tok.GetNextToken();
+        if ( !token )
+            continue;
+
+        // is it a number?
+        unsigned long val;
+        if ( token.ToULong(&val) )
+        {
+            // guess what this number is
+
+            bool isDay = false,
+                 isMonth = false,
+                 isYear = false;
+
+            if ( !haveMon && val > 0 && val <= 12 )
+            {
+                // assume it is month
+                isMonth = true;
+            }
+            else // not the month
+            {
+                if ( haveDay )
+                {
+                    // this can only be the year
+                    isYear = true;
+                }
+                else // may be either day or year
+                {
+                    // use a leap year if we don't have the year yet to allow
+                    // dates like 2/29/1976 which would be rejected otherwise
+                    wxDateTime_t max_days = (wxDateTime_t)(
+                        haveMon
+                        ? GetNumOfDaysInMonth(haveYear ? year : 1976, mon)
+                        : 31
+                    );
+
+                    // can it be day?
+                    if ( (val == 0) || (val > (unsigned long)max_days) )
+                    {
+                        // no
+                        isYear = true;
+                    }
+                    else // yes, suppose it's the day
+                    {
+                        isDay = true;
+                    }
+                }
+            }
+
+            if ( isYear )
+            {
+                if ( haveYear )
+                    break;
+
+                haveYear = true;
+
+                year = (wxDateTime_t)val;
+            }
+            else if ( isDay )
+            {
+                if ( haveDay )
+                    break;
+
+                haveDay = true;
+
+                day = (wxDateTime_t)val;
+            }
+            else if ( isMonth )
+            {
+                haveMon = true;
+
+                mon = (Month)(val - 1);
+            }
+        }
+        else // not a number
+        {
+            // 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 )
+                {
+                    // but we already have a month - maybe we guessed wrong?
+                    if ( !haveDay )
+                    {
+                        // no need to check in month range as always < 12, but
+                        // the days are counted from 1 unlike the months
+                        day = (wxDateTime_t)(mon + 1);
+                        haveDay = true;
+                    }
+                    else
+                    {
+                        // could possible be the year (doesn't the year come
+                        // before the month in the japanese format?) (FIXME)
+                        break;
+                    }
+                }
+
+                mon = mon2;
+
+                haveMon = true;
+            }
+            else // not a valid month name
+            {
+                WeekDay wday2 = GetWeekDayFromName(token, Name_Full | Name_Abbr);
+                if ( wday2 != Inv_WeekDay )
+                {
+                    // a week day
+                    if ( haveWDay )
+                    {
+                        break;
+                    }
+
+                    wday = wday2;
+
+                    haveWDay = true;
+                }
+                else // not a valid weekday name
+                {
+                    // try the ordinals
+                    static const char *ordinals[] =
+                    {
+                        wxTRANSLATE("first"),
+                        wxTRANSLATE("second"),
+                        wxTRANSLATE("third"),
+                        wxTRANSLATE("fourth"),
+                        wxTRANSLATE("fifth"),
+                        wxTRANSLATE("sixth"),
+                        wxTRANSLATE("seventh"),
+                        wxTRANSLATE("eighth"),
+                        wxTRANSLATE("ninth"),
+                        wxTRANSLATE("tenth"),
+                        wxTRANSLATE("eleventh"),
+                        wxTRANSLATE("twelfth"),
+                        wxTRANSLATE("thirteenth"),
+                        wxTRANSLATE("fourteenth"),
+                        wxTRANSLATE("fifteenth"),
+                        wxTRANSLATE("sixteenth"),
+                        wxTRANSLATE("seventeenth"),
+                        wxTRANSLATE("eighteenth"),
+                        wxTRANSLATE("nineteenth"),
+                        wxTRANSLATE("twentieth"),
+                        // that's enough - otherwise we'd have problems with
+                        // composite (or not) ordinals
+                    };
+
+                    size_t n;
+                    for ( n = 0; n < WXSIZEOF(ordinals); n++ )
+                    {
+                        if ( token.CmpNoCase(ordinals[n]) == 0 )
+                        {
+                            break;
+                        }
+                    }
+
+                    if ( n == WXSIZEOF(ordinals) )
+                    {
+                        // stop here - something unknown
+                        break;
+                    }
+
+                    // it's a day
+                    if ( haveDay )
+                    {
+                        // don't try anything here (as in case of numeric day
+                        // above) - the symbolic day spec should always
+                        // precede the month/year
+                        break;
+                    }
+
+                    haveDay = true;
+
+                    day = (wxDateTime_t)(n + 1);
+                }
+            }
+        }
+
+        nPosCur = tok.GetPosition();
+    }
+
+    // either no more tokens or the scan was stopped by something we couldn't
+    // parse - in any case, see if we can construct a date from what we have
+    if ( !haveDay && !haveWDay )
+    {
+        wxLogDebug(_T("ParseDate: no day, no weekday hence no date."));
+
+        return NULL;
+    }
+
+    if ( haveWDay && (haveMon || haveYear || haveDay) &&
+         !(haveDay && haveMon && haveYear) )
+    {
+        // without adjectives (which we don't support here) the week day only
+        // makes sense completely separately or with the full date
+        // specification (what would "Wed 1999" mean?)
+        return NULL;
+    }
+
+    if ( !haveWDay && haveYear && !(haveDay && haveMon) )
+    {
+        // may be we have month and day instead of day and year?
+        if ( haveDay && !haveMon )
+        {
+            if ( day <= 12  )
+            {
+                // exchange day and month
+                mon = (wxDateTime::Month)(day - 1);
+
+                // we're in the current year then
+                if ( (year > 0) && (year <= (int)GetNumOfDaysInMonth(Inv_Year, mon)) )
+                {
+                    day = (wxDateTime_t)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 NULL;
+        }
+    }
+
+    if ( !haveMon )
+    {
+        mon = GetCurrentMonth();
+    }
+
+    if ( !haveYear )
+    {
+        year = GetCurrentYear();
+    }
+
+    if ( haveDay )
+    {
+        // normally we check the day above but the check is optimistic in case
+        // we find the day before its month/year so we have to redo it now
+        if ( day > GetNumOfDaysInMonth(year, mon) )
+            return NULL;
+
+        Set(day, mon, year);
+
+        if ( haveWDay )
+        {
+            // check that it is really the same
+            if ( GetWeekDay() != wday )
+            {
+                // inconsistency detected
+                wxLogDebug(_T("ParseDate: inconsistent day/weekday."));
+
+                return NULL;
+            }
+        }
+    }
+    else // haveWDay
+    {
+        *this = Today();
+
+        SetToWeekDayInSameWeek(wday);
+    }
+
+    // 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--;
+    }
+
+    const size_t endpos = p - date.wx_str();
+    if ( end )
+        *end = date.begin() + endpos;
+
+    return date.c_str() + endpos;
+}
+
+const char *
+wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end)
+{
+    // first try some extra things
+    static const struct
+    {
+        const char *name;
+        wxDateTime_t  hour;
+    } stdTimes[] =
+    {
+        { wxTRANSLATE("noon"),      12 },
+        { wxTRANSLATE("midnight"),  00 },
+        // anything else?
+    };
+
+    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 )
+        {
+            // casts required by DigitalMars
+            Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));
+
+            if ( end )
+                *end = time.begin() + len;
+
+            return time.c_str() + len;
+        }
+    }
+
+    // try all time formats we may think about in the order from longest to
+    // shortest
+    static const char *timeFormats[] =
+    {
+        "%I:%M:%S %p",  // 12hour with AM/PM
+        "%H:%M:%S",     // could be the same or 24 hour one so try it too
+        "%I:%M %p",     // 12hour with AM/PM but without seconds
+        "%H:%M:%S",     // and a possibly 24 hour version without seconds
+        "%X",           // possibly something from above or maybe something
+                        // completely different -- try it last
+
+        // TODO: parse timezones
+    };
+
+    for ( size_t nFmt = 0; nFmt < WXSIZEOF(timeFormats); nFmt++ )
+    {
+        const char *result = ParseFormat(time, timeFormats[nFmt], end);
+        if ( result )
+            return result;
+    }
+
+    return NULL;
+}
+
+// ----------------------------------------------------------------------------
+// Workdays and holidays support
+// ----------------------------------------------------------------------------
+
+bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const
+{
+    return !wxDateTimeHolidayAuthority::IsHoliday(*this);
+}
+
+// ============================================================================
+// wxDateSpan
+// ============================================================================
+
+wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds)
+{
+    wxDateSpan ds1(ds);
+    return ds1.Multiply(n);
+}
+
+// ============================================================================
+// wxTimeSpan
+// ============================================================================
+
+wxTimeSpan WXDLLIMPEXP_BASE operator*(int n, const wxTimeSpan& ts)
+{
+    return wxTimeSpan(ts).Multiply(n);
+}
+
+// this enum is only used in wxTimeSpan::Format() below but we can't declare
+// it locally to the method as it provokes an internal compiler error in egcs
+// 2.91.60 when building with -O2
+enum TimeSpanPart
+{
+    Part_Week,
+    Part_Day,
+    Part_Hour,
+    Part_Min,
+    Part_Sec,
+    Part_MSec
+};
+
+// not all strftime(3) format specifiers make sense here because, for example,
+// a time span doesn't have a year nor a timezone
+//
+// Here are the ones which are supported (all of them are supported by strftime
+// as well):
+//  %H          hour in 24 hour format
+//  %M          minute (00 - 59)
+//  %S          second (00 - 59)
+//  %%          percent sign
+//
+// Also, for MFC CTimeSpan compatibility, we support
+//  %D          number of days
+//
+// And, to be better than MFC :-), we also have
+//  %E          number of wEeks
+//  %l          milliseconds (000 - 999)
+wxString wxTimeSpan::Format(const wxString& format) const
+{
+    wxCHECK_MSG( !format.empty(), wxEmptyString,
+                 _T("NULL format in wxTimeSpan::Format") );
+
+    wxString str;
+    str.Alloc(format.length());
+
+    // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */)
+    //
+    // Then, of course, ts.Format("%H:%M:%S") must return "01:02:03", but the
+    // question is what should ts.Format("%S") do? The code here returns "3273"
+    // in this case (i.e. the total number of seconds, not just seconds % 60)
+    // because, for me, this call means "give me entire time interval in
+    // seconds" and not "give me the seconds part of the time interval"
+    //
+    // If we agree that it should behave like this, it is clear that the
+    // interpretation of each format specifier depends on the presence of the
+    // other format specs in the string: if there was "%H" before "%M", we
+    // should use GetMinutes() % 60, otherwise just GetMinutes() &c
+
+    // we remember the most important unit found so far
+    TimeSpanPart partBiggest = Part_MSec;
+
+    for ( wxString::const_iterator pch = format.begin(); pch != format.end(); ++pch )
+    {
+        wxChar ch = *pch;
+
+        if ( ch == _T('%') )
+        {
+            // the start of the format specification of the printf() below
+            wxString fmtPrefix(_T('%'));
+
+            // the number
+            long n;
+
+            // the number of digits for the format string, 0 if unused
+            unsigned digits = 0;
+
+            ch = *++pch;    // get the format spec char
+            switch ( ch )
+            {
+                default:
+                    wxFAIL_MSG( _T("invalid format character") );
+                    // fall through
+
+                case _T('%'):
+                    str += ch;
+
+                    // skip the part below switch
+                    continue;
+
+                case _T('D'):
+                    n = GetDays();
+                    if ( partBiggest < Part_Day )
+                    {
+                        n %= DAYS_PER_WEEK;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Day;
+                    }
+                    break;
+
+                case _T('E'):
+                    partBiggest = Part_Week;
+                    n = GetWeeks();
+                    break;
+
+                case _T('H'):
+                    n = GetHours();
+                    if ( partBiggest < Part_Hour )
+                    {
+                        if ( n < 0 )
+                        {
+                            // the sign has already been taken into account
+                            // when outputting the biggest part
+                            n = -n;
+                        }
+
+                        n %= HOURS_PER_DAY;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Hour;
+                    }
+
+                    digits = 2;
+                    break;
+
+                case _T('l'):
+                    n = GetMilliseconds().ToLong();
+                    if ( partBiggest < Part_MSec )
+                    {
+                        if ( n < 0 )
+                            n = -n;
+
+                        n %= 1000;
+                    }
+                    //else: no need to reset partBiggest to Part_MSec, it is
+                    //      the least significant one anyhow
+
+                    digits = 3;
+                    break;
+
+                case _T('M'):
+                    n = GetMinutes();
+                    if ( partBiggest < Part_Min )
+                    {
+                        if ( n < 0 )
+                            n = -n;
+
+                        n %= MIN_PER_HOUR;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Min;
+                    }
+
+                    digits = 2;
+                    break;
+
+                case _T('S'):
+                    n = GetSeconds().ToLong();
+                    if ( partBiggest < Part_Sec )
+                    {
+                        if ( n < 0 )
+                            n = -n;
+
+                        n %= SEC_PER_MIN;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Sec;
+                    }
+
+                    digits = 2;
+                    break;
+            }
+
+            if ( digits )
+            {
+                // negative numbers need one extra position for '-' display
+                if ( n < 0 )
+                    digits++;
+
+                fmtPrefix << _T("0") << digits;
+            }
+
+            str += wxString::Format(fmtPrefix + _T("ld"), n);
+        }
+        else
+        {
+            // normal character, just copy
+            str += ch;
+        }
+    }
+
+    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.size();
+    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.Clear();
+
+    const size_t countAuth = ms_authorities.size();
+    for ( size_t nAuth = 0; nAuth < countAuth; nAuth++ )
+    {
+        ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
+
+        WX_APPEND_ARRAY(holidays, hol);
+    }
+
+    holidays.Sort(wxDateTimeCompareFunc);
+
+    return holidays.size();
+}
+
+/* static */
+void wxDateTimeHolidayAuthority::ClearAllAuthorities()
+{
+    WX_CLEAR_ARRAY(ms_authorities);
+}
+
+/* static */
+void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
+{
+    ms_authorities.push_back(auth);
+}
+
+wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
+{
+    // required here for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// 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();
+}
+
+// ============================================================================
+// other helper functions
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// iteration helpers: can be used to write a for loop over enum variable like
+// this:
+//  for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
+// ----------------------------------------------------------------------------
+
+WXDLLIMPEXP_BASE void wxNextMonth(wxDateTime::Month& m)
+{
+    wxASSERT_MSG( m < wxDateTime::Inv_Month, _T("invalid month") );
+
+    // no wrapping or the for loop above would never end!
+    m = (wxDateTime::Month)(m + 1);
+}
+
+WXDLLIMPEXP_BASE void wxPrevMonth(wxDateTime::Month& m)
+{
+    wxASSERT_MSG( m < wxDateTime::Inv_Month, _T("invalid month") );
+
+    m = m == wxDateTime::Jan ? wxDateTime::Inv_Month
+                             : (wxDateTime::Month)(m - 1);
+}
+
+WXDLLIMPEXP_BASE void wxNextWDay(wxDateTime::WeekDay& wd)
+{
+    wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, _T("invalid week day") );
+
+    // no wrapping or the for loop above would never end!
+    wd = (wxDateTime::WeekDay)(wd + 1);
+}
+
+WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd)
+{
+    wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, _T("invalid week day") );
+
+    wd = wd == wxDateTime::Sun ? wxDateTime::Inv_WeekDay
+                               : (wxDateTime::WeekDay)(wd - 1);
+}
+
+#endif // wxUSE_DATETIME