Revised #ifndef WX_PRECOMP headers, added missing #include wx/wxcrtvararg.h

[wxWidgets.git] / src / common / datetime.cpp
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp

index 4f1df66c7ec2d0fc4acd85e9c93f2dae9ab96ee3..8bd4933a187b83f9ecbb48717bdfa58ebd455e54 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -1,5 +1,5 @@
  ///////////////////////////////////////////////////////////////////////////////
  ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/datetime.h
+// Name:        src/common/datetime.cpp
  // Purpose:     implementation of time/date related classes
  // Author:      Vadim Zeitlin
  // Modified by:
  // Purpose:     implementation of time/date related classes
  // Author:      Vadim Zeitlin
  // Modified by:
@@ -52,10 +52,6 @@
  // headers
  // ----------------------------------------------------------------------------
  
  // headers
  // ----------------------------------------------------------------------------
  
-#ifdef __GNUG__
-    #pragma implementation "datetime.h"
-#endif
-
  // For compilers that support precompilation, includes "wx.h".
  #include "wx/wxprec.h"
  
  // For compilers that support precompilation, includes "wx.h".
  #include "wx/wxprec.h"
  
@@ -66,24 +62,50 @@
  #if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
  
  #ifndef WX_PRECOMP
  #if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
  
  #ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
      #include "wx/string.h"
      #include "wx/log.h"
      #include "wx/string.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
  
  #endif // WX_PRECOMP
  
-#include "wx/intl.h"
  #include "wx/thread.h"
  #include "wx/tokenzr.h"
  #include "wx/thread.h"
  #include "wx/tokenzr.h"
-#include "wx/module.h"
-
-#define wxDEFINE_TIME_CONSTANTS // before including datetime.h
  
  #include <ctype.h>
  
  
  #include <ctype.h>
  
+#ifdef __WINDOWS__
+    #include <winnls.h>
+    #ifndef __WXWINCE__
+        #include <locale.h>
+    #endif
+#endif
+
  #include "wx/datetime.h"
  #include "wx/datetime.h"
-#include "wx/timer.h"           // for wxGetLocalTimeMillis()
  
  const long wxDateTime::TIME_T_FACTOR = 1000l;
  
  
  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
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
  // conditional compilation
  // ----------------------------------------------------------------------------
@@ -100,12 +122,26 @@ const long wxDateTime::TIME_T_FACTOR = 1000l;
      #undef HAVE_STRPTIME
  #endif // broken strptime()
  
      #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(__MWERKS__) && wxUSE_UNICODE
      #include <wtime.h>
  #endif
  
  #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
-    #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
+    #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 _timezone
      #elif defined(__MWERKS__)
          long wxmw_timezone = 28800;
@@ -127,23 +163,127 @@ const long wxDateTime::TIME_T_FACTOR = 1000l;
          #define WX_TIMEZONE wxGetTimeZone()
      #elif defined(__DARWIN__)
          #define WX_GMTOFF_IN_TM
          #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
  
      #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()
  // ----------------------------------------------------------------------------
  // macros
  // ----------------------------------------------------------------------------
  
  // debugging helper: just a convenient replacement of wxCHECK()
-#define wxDATETIME_CHECK(expr, msg)     \
-        if ( !(expr) )                  \
-        {                               \
-            wxFAIL_MSG(msg);            \
-            *this = wxInvalidDateTime;  \
-            return *this;               \
-        }
+#define wxDATETIME_CHECK(expr, msg) \
+    wxCHECK2_MSG(expr, *this = wxInvalidDateTime; return *this, msg)
  
  // ----------------------------------------------------------------------------
  // private classes
  
  // ----------------------------------------------------------------------------
  // private classes
@@ -156,13 +296,13 @@ public:
      {
          wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
  
      {
          wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
  
-        return TRUE;
+        return true;
      }
  
      virtual void OnExit()
      {
          wxDateTimeHolidayAuthority::ClearAllAuthorities();
      }
  
      virtual void OnExit()
      {
          wxDateTimeHolidayAuthority::ClearAllAuthorities();
-        wxDateTimeHolidayAuthority::ms_authorities.Clear();
+        wxDateTimeHolidayAuthority::ms_authorities.clear();
      }
  
  private:
      }
  
  private:
@@ -194,11 +334,14 @@ static const long MILLISECONDS_PER_DAY = 86400000l;
  // (i.e. JDN(Jan 1, 1970) = 2440587.5)
  static const long EPOCH_JDN = 2440587l;
  
  // (i.e. JDN(Jan 1, 1970) = 2440587.5)
  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;
  // 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;
  
  // the constants used for JDN calculations
  static const long JDN_OFFSET         = 32046l;
@@ -218,33 +361,28 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
  // global data
  // ----------------------------------------------------------------------------
  
  // global data
  // ----------------------------------------------------------------------------
  
+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;
  
  // 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 globals
-// ----------------------------------------------------------------------------
-
-// a critical section is needed to protect GetTimeZone() static
-// variable in MT case
-#if wxUSE_THREADS
-    static wxCriticalSection gs_critsectTimezone;
-#endif // wxUSE_THREADS
-
  // ----------------------------------------------------------------------------
  // private functions
  // ----------------------------------------------------------------------------
  
  // debugger helper: shows what the date really is
  #ifdef __WXDEBUG__
  // ----------------------------------------------------------------------------
  // private functions
  // ----------------------------------------------------------------------------
  
  // debugger helper: shows what the date really is
  #ifdef __WXDEBUG__
-extern const wxChar *wxDumpDate(const wxDateTime* dt)
+extern const char *wxDumpDate(const wxDateTime* dt)
  {
  {
-    static wxChar buf[128];
+    static char buf[128];
  
  
-    wxStrcpy(buf, dt->Format(_T("%Y-%m-%d (%a) %H:%M:%S")));
+    wxString fmt(dt->Format("%Y-%m-%d (%a) %H:%M:%S"));
+    wxStrncpy(buf, fmt + " (" + dt->GetValue().ToString() + " ticks)",
+              WXSIZEOF(buf));
  
      return buf;
  }
  
      return buf;
  }
@@ -269,38 +407,32 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
  // (in seconds)
  static int GetTimeZone()
  {
  // (in seconds)
  static int GetTimeZone()
  {
-    // set to TRUE when the timezone is set
-    static bool s_timezoneSet = FALSE;
-#ifdef WX_GMTOFF_IN_TM
+    // set to true when the timezone is set
+    static bool s_timezoneSet = false;
      static long gmtoffset = LONG_MAX; // invalid timezone
      static long gmtoffset = LONG_MAX; // invalid timezone
-#endif
-
-    wxCRIT_SECT_LOCKER(lock, gs_critsectTimezone);
  
  
-    // ensure that the timezone variable is set by calling localtime
+    // ensure that the timezone variable is set by calling wxLocaltime_r
      if ( !s_timezoneSet )
      {
      if ( !s_timezoneSet )
      {
-        // just call localtime() instead of figuring out whether this system
-        // supports tzset(), _tzset() or something else
+        // just call wxLocaltime_r() instead of figuring out whether this
+        // system supports tzset(), _tzset() or something else
          time_t t = 0;
          time_t t = 0;
-        struct tm *tm;
+        struct tm tm;
  
  
-        tm = localtime(&t);
-        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
  
  #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;
-#endif
+        gmtoffset = -tm.tm_gmtoff;
+#else // !WX_GMTOFF_IN_TM
+        gmtoffset = WX_TIMEZONE;
+#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
      }
  
      }
  
-#ifdef WX_GMTOFF_IN_TM
      return (int)gmtoffset;
      return (int)gmtoffset;
-#else
-    return (int)WX_TIMEZONE;
-#endif
  }
  
  // return the integral part of the JDN for the midnight of the given date (to
  }
  
  // return the integral part of the JDN for the midnight of the given date (to
@@ -343,29 +475,46 @@ static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
              - JDN_OFFSET;
  }
  
              - JDN_OFFSET;
  }
  
+#ifdef HAVE_STRFTIME
+
  // this function is a wrapper around strftime(3) adding error checking
  // this function is a wrapper around strftime(3) adding error checking
-static wxString CallStrftime(const wxChar *format, const tm* tm)
+static wxString CallStrftime(const wxString& format, const tm* tm)
  {
      wxChar buf[4096];
  {
      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) )
      {
      if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
      {
-        // buffer is too small?
+        // if the format is valid, buffer must be too small?
          wxFAIL_MSG(_T("strftime() failed"));
          wxFAIL_MSG(_T("strftime() failed"));
+
+        buf[0] = '\0';
      }
  
      }
  
-    return wxString(buf);
+    s = buf;
+    return s;
  }
  
  }
  
+#endif // HAVE_STRFTIME
+
  #ifdef HAVE_STRPTIME
  
  #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
  // Unicode-friendly strptime() wrapper
-static const wxChar *
-CallStrptime(const wxChar *input, const char *fmt, tm *tm)
+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
  {
      // 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
+#if wxUSE_UNICODE_WCHAR
      wxCharBuffer inputMB(wxConvertWX2MB(input));
  #else // ASCII
      const char * const inputMB = input;
      wxCharBuffer inputMB(wxConvertWX2MB(input));
  #else // ASCII
      const char * const inputMB = input;
@@ -375,7 +524,7 @@ CallStrptime(const wxChar *input, const char *fmt, tm *tm)
      if ( !result )
          return NULL;
  
      if ( !result )
          return NULL;
  
-#if wxUSE_UNICODE
+#if wxUSE_UNICODE_WCHAR
      // FIXME: this is wrong in presence of surrogates &c
      return input + (result - inputMB.data());
  #else // ASCII
      // FIXME: this is wrong in presence of surrogates &c
      return input + (result - inputMB.data());
  #else // ASCII
@@ -390,10 +539,11 @@ static void ReplaceDefaultYearMonthWithCurrent(int *year,
                                                 wxDateTime::Month *month)
  {
      struct tm *tmNow = NULL;
                                                 wxDateTime::Month *month)
  {
      struct tm *tmNow = NULL;
+    struct tm tmstruct;
  
      if ( *year == wxDateTime::Inv_Year )
      {
  
      if ( *year == wxDateTime::Inv_Year )
      {
-        tmNow = wxDateTime::GetTmNow();
+        tmNow = wxDateTime::GetTmNow(&tmstruct);
  
          *year = 1900 + tmNow->tm_year;
      }
  
          *year = 1900 + tmNow->tm_year;
      }
@@ -401,7 +551,7 @@ static void ReplaceDefaultYearMonthWithCurrent(int *year,
      if ( *month == wxDateTime::Inv_Month )
      {
          if ( !tmNow )
      if ( *month == wxDateTime::Inv_Month )
      {
          if ( !tmNow )
-            tmNow = wxDateTime::GetTmNow();
+            tmNow = wxDateTime::GetTmNow(&tmstruct);
  
          *month = (wxDateTime::Month)tmNow->tm_mon;
      }
  
          *month = (wxDateTime::Month)tmNow->tm_mon;
      }
@@ -482,8 +632,17 @@ static wxDateTime::WeekDay GetWeekDayFromName(const wxString& name, int flags)
      return wd;
  }
  
      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
  // scans all digits (but no more than len) and returns the resulting number
-static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *number)
+static bool GetNumericToken(size_t len,
+                            const wxStringCharType*& p,
+                            unsigned long *number)
  {
      size_t n = 1;
      wxString s;
  {
      size_t n = 1;
      wxString s;
@@ -495,11 +654,11 @@ static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *number)
              break;
      }
  
              break;
      }
  
-    return !!s && s.ToULong(number);
+    return !s.empty() && s.ToULong(number);
  }
  
  // scans all alphabetic characters and returns the resulting string
  }
  
  // scans all alphabetic characters and returns the resulting string
-static wxString GetAlphaToken(const wxChar*& p)
+static wxString GetAlphaToken(const wxStringCharType*& p)
  {
      wxString s;
      while ( wxIsalpha(*p) )
  {
      wxString s;
      while ( wxIsalpha(*p) )
@@ -531,14 +690,14 @@ wxDateTime::Tm::Tm(const struct tm& tm, const TimeZone& tz)
                : m_tz(tz)
  {
      msec = 0;
                : 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;
      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
  }
  
  bool wxDateTime::Tm::IsValid() const
@@ -554,7 +713,7 @@ void wxDateTime::Tm::ComputeWeekDay()
      // 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
      // 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::WeekDay)(GetTruncatedJDN(mday, mon, year) + 2) % 7;
+    wday = (wxDateTime::wxDateTime_t)((GetTruncatedJDN(mday, mon, year) + 2) % 7);
  }
  
  void wxDateTime::Tm::AddMonths(int monDiff)
  }
  
  void wxDateTime::Tm::AddMonths(int monDiff)
@@ -592,7 +751,7 @@ void wxDateTime::Tm::AddDays(int dayDiff)
          dayDiff += GetNumOfDaysInMonth(year, mon);
      }
  
          dayDiff += GetNumOfDaysInMonth(year, mon);
      }
  
-    mday += dayDiff;
+    mday = (wxDateTime::wxDateTime_t)( mday + dayDiff );
      while ( mday > GetNumOfDaysInMonth(year, mon) )
      {
          mday -= GetNumOfDaysInMonth(year, mon);
      while ( mday > GetNumOfDaysInMonth(year, mon) )
      {
          mday -= GetNumOfDaysInMonth(year, mon);
@@ -646,12 +805,13 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
          case wxDateTime::GMT10:
          case wxDateTime::GMT11:
          case wxDateTime::GMT12:
          case wxDateTime::GMT10:
          case wxDateTime::GMT11:
          case wxDateTime::GMT12:
+        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 = 3600*(tz - wxDateTime::GMT0);
              break;
  
          case wxDateTime::A_CST:
              // Central Standard Time in use in Australia = UTC + 9.5
-            m_offset = 60l*(9*60 + 30);
+            m_offset = 60l*(9*MIN_PER_HOUR + MIN_PER_HOUR/2);
              break;
  
          default:
              break;
  
          default:
@@ -686,7 +846,7 @@ bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal)
      {
          wxFAIL_MSG(_T("unknown calendar"));
  
      {
          wxFAIL_MSG(_T("unknown calendar"));
  
-        return FALSE;
+        return false;
      }
  }
  
      }
  }
  
@@ -795,8 +955,8 @@ wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(wxDateTime::Month month,
  wxString wxDateTime::GetMonthName(wxDateTime::Month month,
                                    wxDateTime::NameFlags flags)
  {
  wxString wxDateTime::GetMonthName(wxDateTime::Month month,
                                    wxDateTime::NameFlags flags)
  {
-    wxCHECK_MSG( month != Inv_Month, _T(""), _T("invalid month") );
-
+    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;
      // 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;
@@ -804,18 +964,63 @@ wxString wxDateTime::GetMonthName(wxDateTime::Month month,
      tm.tm_mon = month;
  
      return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &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,
                                      wxDateTime::NameFlags flags)
  {
  }
  
  /* static */
  wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
                                      wxDateTime::NameFlags flags)
  {
-    wxCHECK_MSG( wday != Inv_WeekDay, _T(""), _T("invalid weekday") );
-
-    // take some arbitrary Sunday
+    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;
      InitTm(tm);
-    tm.tm_mday = 28;
+    tm.tm_mday = 21;
      tm.tm_mon = Nov;
      tm.tm_year = 99;
  
      tm.tm_mon = Nov;
      tm.tm_year = 99;
  
@@ -827,6 +1032,34 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
  
      // ... and call strftime()
      return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm);
  
      // ... 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
  }
  
  /* static */
  }
  
  /* static */
@@ -834,14 +1067,29 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
  {
      tm tm;
      InitTm(tm);
  {
      tm tm;
      InitTm(tm);
+    wxChar buffer[64];
+    // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
+    // and causes an assertion failed if the buffer is to small (which is good) - OR -
+    // if strftime does not return anything because the format string is invalid - OR -
+    // if there are no 'am' / 'pm' tokens defined for the current locale (which is not good).
+    // wxDateTime::ParseTime will try several different formats to parse the time.
+    // As a result, GetAmPmStrings might get called, even if the current locale
+    // does not define any 'am' / 'pm' tokens. In this case, wxStrftime would
+    // assert, even though it is a perfectly legal use.
      if ( am )
      {
      if ( am )
      {
-        *am = CallStrftime(_T("%p"), &tm);
+        if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0)
+            *am = wxString(buffer);
+        else
+            *am = wxString();
      }
      if ( pm )
      {
          tm.tm_hour = 13;
      }
      if ( pm )
      {
          tm.tm_hour = 13;
-        *pm = CallStrftime(_T("%p"), &tm);
+        if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0)
+            *pm = wxString(buffer);
+        else
+            *pm = wxString();
      }
  }
  
      }
  }
  
@@ -854,12 +1102,13 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
  wxDateTime::Country wxDateTime::GetCountry()
  {
      // TODO use LOCALE_ICOUNTRY setting under Win32
  wxDateTime::Country wxDateTime::GetCountry()
  {
      // TODO use LOCALE_ICOUNTRY setting under Win32
-
+#ifndef __WXWINCE__
      if ( ms_country == Country_Unknown )
      {
          // try to guess from the time zone name
          time_t t = time(NULL);
      if ( ms_country == Country_Unknown )
      {
          // try to guess from the time zone name
          time_t t = time(NULL);
-        struct tm *tm = localtime(&t);
+        struct tm tmstruct;
+        struct tm *tm = wxLocaltime_r(&t, &tmstruct);
  
          wxString tz = CallStrftime(_T("%Z"), tm);
          if ( tz == _T("WET") || tz == _T("WEST") )
  
          wxString tz = CallStrftime(_T("%Z"), tm);
          if ( tz == _T("WET") || tz == _T("WEST") )
@@ -888,6 +1137,9 @@ wxDateTime::Country wxDateTime::GetCountry()
              ms_country = USA;
          }
      }
              ms_country = USA;
          }
      }
+#else // __WXWINCE__
+     ms_country = USA;
+#endif // !__WXWINCE__/__WXWINCE__
  
      return ms_country;
  }
  
      return ms_country;
  }
@@ -978,9 +1230,6 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country)
          }
  
          dt += wxTimeSpan::Hours(1);
          }
  
          dt += wxTimeSpan::Hours(1);
-
-        // disable DST tests because it could result in an infinite recursion!
-        dt.MakeGMT(TRUE);
      }
      else switch ( country )
      {
      }
      else switch ( country )
      {
@@ -1079,9 +1328,6 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
          }
  
          dt += wxTimeSpan::Hours(1);
          }
  
          dt += wxTimeSpan::Hours(1);
-
-        // disable DST tests because it could result in an infinite recursion!
-        dt.MakeGMT(TRUE);
      }
      else switch ( country )
      {
      }
      else switch ( country )
      {
@@ -1146,16 +1392,11 @@ wxDateTime& wxDateTime::Set(const struct tm& tm)
          // less than timezone - try to make it work for this case
          if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
          {
          // less than timezone - try to make it work for this case
          if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
          {
-            // add timezone to make sure that date is in range
-            tm2.tm_sec -= GetTimeZone();
-
-            timet = mktime(&tm2);
-            if ( timet != (time_t)-1 )
-            {
-                timet += GetTimeZone();
-
-                return Set(timet);
-            }
+            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") );
          }
  
          wxFAIL_MSG( _T("mktime() failed") );
@@ -1184,16 +1425,26 @@ wxDateTime& wxDateTime::Set(wxDateTime_t hour,
                        _T("Invalid time in wxDateTime::Set()") );
  
      // get the current date from system
                        _T("Invalid time in wxDateTime::Set()") );
  
      // get the current date from system
-    struct tm *tm = GetTmNow();
+    struct tm tmstruct;
+    struct tm *tm = GetTmNow(&tmstruct);
+
+    wxDATETIME_CHECK( tm, _T("wxLocaltime_r() failed") );
  
  
-    wxDATETIME_CHECK( tm, _T("localtime() failed") );
+    // make a copy so it isn't clobbered by the call to mktime() below
+    struct tm tm1(*tm);
  
      // adjust the time
  
      // 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;
  
  
-    (void)Set(*tm);
+    // 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(tm1);
  
      // and finally adjust milliseconds
      return SetMillisecond(millisec);
  
      // and finally adjust milliseconds
      return SetMillisecond(millisec);
@@ -1240,7 +1491,10 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
          (void)Set(tm);
  
          // and finally adjust milliseconds
          (void)Set(tm);
  
          // and finally adjust milliseconds
-        return SetMillisecond(millisec);
+        if (IsValid())
+            SetMillisecond(millisec);
+
+        return *this;
      }
      else
      {
      }
      else
      {
@@ -1265,9 +1519,9 @@ wxDateTime& wxDateTime::Set(double jdn)
      // EPOCH_JDN + 0.5
      jdn -= EPOCH_JDN + 0.5;
  
      // EPOCH_JDN + 0.5
      jdn -= EPOCH_JDN + 0.5;
  
-    jdn *= MILLISECONDS_PER_DAY;
+    m_time.Assign(jdn*MILLISECONDS_PER_DAY);
  
  
-    m_time.Assign(jdn);
+    // JDNs always are in UTC, so we don't need any adjustments for time zone
  
      return *this;
  }
  
      return *this;
  }
@@ -1289,6 +1543,16 @@ wxDateTime& wxDateTime::ResetTime()
      return *this;
  }
  
      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
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
  // DOS Date and Time Format functions
  // ----------------------------------------------------------------------------
@@ -1306,6 +1570,7 @@ wxDateTime& wxDateTime::ResetTime()
  wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
  {
      struct tm tm;
  wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
  {
      struct tm tm;
+    InitTm(tm);
  
      long year = ddt & 0xFE000000;
      year >>= 25;
  
      long year = ddt & 0xFE000000;
      year >>= 25;
@@ -1339,7 +1604,9 @@ unsigned long wxDateTime::GetAsDOS() const
  {
      unsigned long ddt;
      time_t ticks = GetTicks();
  {
      unsigned long ddt;
      time_t ticks = GetTicks();
-    struct tm *tm = localtime(&ticks);
+    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;
  
      long year = tm->tm_year;
      year -= 80;
@@ -1377,14 +1644,15 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
      if ( time != (time_t)-1 )
      {
          // use C RTL functions
      if ( time != (time_t)-1 )
      {
          // use C RTL functions
+        struct tm tmstruct;
          tm *tm;
          if ( tz.GetOffset() == -GetTimeZone() )
          {
              // we are working with local time
          tm *tm;
          if ( tz.GetOffset() == -GetTimeZone() )
          {
              // we are working with local time
-            tm = localtime(&time);
+            tm = wxLocaltime_r(&time, &tmstruct);
  
              // should never happen
  
              // should never happen
-            wxCHECK_MSG( tm, Tm(), _T("localtime() failed") );
+            wxCHECK_MSG( tm, Tm(), _T("wxLocaltime_r() failed") );
          }
          else
          {
          }
          else
          {
@@ -1396,10 +1664,10 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
              if ( time >= 0 )
  #endif
              {
              if ( time >= 0 )
  #endif
              {
-                tm = gmtime(&time);
+                tm = wxGmtime_r(&time, &tmstruct);
  
                  // should never happen
  
                  // should never happen
-                wxCHECK_MSG( tm, Tm(), _T("gmtime() failed") );
+                wxCHECK_MSG( tm, Tm(), _T("wxGmtime_r() failed") );
              }
              else
              {
              }
              else
              {
@@ -1485,14 +1753,14 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
      timeOnly -= tm.msec;
      timeOnly /= 1000;               // now we have time in seconds
  
      timeOnly -= tm.msec;
      timeOnly /= 1000;               // now we have time in seconds
  
-    tm.sec = (wxDateTime_t)(timeOnly % 60);
+    tm.sec = (wxDateTime_t)(timeOnly % SEC_PER_MIN);
      timeOnly -= tm.sec;
      timeOnly -= tm.sec;
-    timeOnly /= 60;                 // now we have time in minutes
+    timeOnly /= SEC_PER_MIN;        // now we have time in minutes
  
  
-    tm.min = (wxDateTime_t)(timeOnly % 60);
+    tm.min = (wxDateTime_t)(timeOnly % MIN_PER_HOUR);
      timeOnly -= tm.min;
  
      timeOnly -= tm.min;
  
-    tm.hour = (wxDateTime_t)(timeOnly / 60);
+    tm.hour = (wxDateTime_t)(timeOnly / MIN_PER_HOUR);
  
      return tm;
  }
  
      return tm;
  }
@@ -1612,27 +1880,66 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
  // Weekday and monthday stuff
  // ----------------------------------------------------------------------------
  
  // Weekday and monthday stuff
  // ----------------------------------------------------------------------------
  
-bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
-                              WeekDay weekday,
-                              WeekFlags flags)
+// convert Sun, Mon, ..., Sat into 6, 0, ..., 5
+static inline int ConvertWeekDayToMondayBase(int wd)
+{
+    return wd == wxDateTime::Sun ? 6 : wd - 1;
+}
+
+/* static */
+wxDateTime
+wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd)
  {
      wxASSERT_MSG( numWeek > 0,
                    _T("invalid week number: weeks are counted from 1") );
  
  {
      wxASSERT_MSG( numWeek > 0,
                    _T("invalid week number: weeks are counted from 1") );
  
-    int year = GetYear();
+    // Jan 4 always lies in the 1st week of the year
+    wxDateTime dt(4, Jan, year);
+    dt.SetToWeekDayInSameWeek(wd);
+    dt += wxDateSpan::Weeks(numWeek - 1);
+
+    return dt;
+}
  
  
+#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
      // Jan 4 always lies in the 1st week of the year
-    Set(4, Jan, year);
-    SetToWeekDayInSameWeek(weekday, flags) += wxDateSpan::Weeks(numWeek - 1);
+    wxDateTime dt(4, wxDateTime::Jan, year);
+    dt.SetToWeekDayInSameWeek(weekday, flags);
+    dt += wxDateSpan::Weeks(numWeek - 1);
  
  
+    return dt;
+}
+
+bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
+                              WeekDay weekday,
+                              WeekFlags flags)
+{
+    int year = GetYear();
+    *this = ::SetToTheWeek(year, numWeek, weekday, flags);
      if ( GetYear() != year )
      {
          // oops... numWeek was too big
      if ( GetYear() != year )
      {
          // oops... numWeek was too big
-        return FALSE;
+        return false;
      }
  
      }
  
-    return TRUE;
+    return true;
+}
+
+wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,
+                               WeekDay weekday,
+                               WeekFlags flags) const
+{
+    return ::SetToTheWeek(GetYear(), numWeek, weekday, flags);
  }
  }
+#endif // WXWIN_COMPATIBILITY_2_6
  
  wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
                                            int year)
  
  wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
                                            int year)
@@ -1650,8 +1957,9 @@ wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)
  {
      wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
  
  {
      wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
  
-    int wdayThis = GetWeekDay();
-    if ( weekday == wdayThis )
+    int wdayDst = weekday,
+        wdayThis = GetWeekDay();
+    if ( wdayDst == wdayThis )
      {
          // nothing to do
          return *this;
      {
          // nothing to do
          return *this;
@@ -1665,21 +1973,23 @@ wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)
      // 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
      // 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 ( flags == Monday_First )
      {
          if ( wdayThis == Sun )
              wdayThis += 7;
      {
          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
      }
      //else: Sunday_First, nothing to do
  
      // go forward or back in time to the day we want
-    if ( weekday < wdayThis )
+    if ( wdayDst < wdayThis )
      {
      {
-        return Subtract(wxDateSpan::Days(wdayThis - weekday));
+        return Subtract(wxDateSpan::Days(wdayThis - wdayDst));
      }
      else // weekday > wdayThis
      {
      }
      else // weekday > wdayThis
      {
-        return Add(wxDateSpan::Days(weekday - wdayThis));
+        return Add(wxDateSpan::Days(wdayDst - wdayThis));
      }
  }
  
      }
  }
  
@@ -1736,9 +2046,9 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday,
                                Month month,
                                int year)
  {
                                Month month,
                                int year)
  {
-    wxCHECK_MSG( weekday != Inv_WeekDay, FALSE, _T("invalid weekday") );
+    wxCHECK_MSG( weekday != Inv_WeekDay, false, _T("invalid weekday") );
  
  
-    // we don't check explicitly that -5 <= n <= 5 because we will return FALSE
+    // we don't check explicitly that -5 <= n <= 5 because we will return false
      // anyhow in such case - but may be should still give an assert for it?
  
      // take the current month/year if none specified
      // anyhow in such case - but may be should still give an assert for it?
  
      // take the current month/year if none specified
@@ -1790,52 +2100,87 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday,
      {
          *this = dt;
  
      {
          *this = dt;
  
-        return TRUE;
+        return true;
      }
      else
      {
          // no such day in this month
      }
      else
      {
          // no such day in this month
-        return FALSE;
+        return false;
      }
  }
  
      }
  }
  
-wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
+static inline
+wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm)
  {
  {
-    Tm tm(GetTm(tz));
+    return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday);
+}
  
  
-    return gs_cumulatedDays[IsLeapYear(tm.year)][tm.mon] + tm.mday;
+wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
+{
+    return GetDayOfYearFromTm(GetTm(tz));
  }
  
  }
  
-wxDateTime::wxDateTime_t wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags,
-                                                   const TimeZone& tz) const
+wxDateTime::wxDateTime_t
+wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const
  {
      if ( flags == Default_First )
      {
          flags = GetCountry() == USA ? Sunday_First : Monday_First;
      }
  
  {
      if ( flags == Default_First )
      {
          flags = GetCountry() == USA ? Sunday_First : Monday_First;
      }
  
-    wxDateTime_t nDayInYear = GetDayOfYear(tz);
-    wxDateTime_t week;
+    Tm tm(GetTm(tz));
+    wxDateTime_t nDayInYear = GetDayOfYearFromTm(tm);
  
  
-    WeekDay wd = GetWeekDay(tz);
+    int wdTarget = GetWeekDay(tz);
+    int wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
+    int week;
      if ( flags == Sunday_First )
      {
      if ( flags == Sunday_First )
      {
-        week = (nDayInYear - wd + 7) / 7;
+        // FIXME: First week is not calculated correctly.
+        week = (nDayInYear - wdTarget + 7) / 7;
+        if ( wdYearStart == Wed || wdYearStart == Thu )
+            week++;
      }
      }
-    else
+    else // week starts with monday
      {
      {
-        // have to shift the week days values
-        week = (nDayInYear - (wd - 1 + 7) % 7 + 7) / 7;
-    }
+        // adjust the weekdays to non-US style.
+        wdYearStart = ConvertWeekDayToMondayBase(wdYearStart);
+        wdTarget = ConvertWeekDayToMondayBase(wdTarget);
  
  
-    // FIXME some more elegant way??
-    WeekDay wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
-    if ( wdYearStart == Wed || wdYearStart == Thu )
-    {
-        week++;
+        // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html:
+        //
+        //      Week 01 of a year is per definition the first week that has the
+        //      Thursday in this year, which is equivalent to the week that
+        //      contains the fourth day of January. In other words, the first
+        //      week of a new year is the week that has the majority of its
+        //      days in the new year. Week 01 might also contain days from the
+        //      previous year and the week before week 01 of a year is the last
+        //      week (52 or 53) of the previous year even if it contains days
+        //      from the new year. A week starts with Monday (day 1) and ends
+        //      with Sunday (day 7).
+        //
+
+        // if Jan 1 is Thursday or less, it is in the first week of this year
+        if ( wdYearStart < 4 )
+        {
+            // count the number of entire weeks between Jan 1 and this date
+            week = (nDayInYear + wdYearStart + 6 - wdTarget)/7;
+
+            // be careful to check for overflow in the next year
+            if ( week == 53 && tm.mday - wdTarget > 28 )
+                    week = 1;
+        }
+        else // Jan 1 is in the last week of the previous year
+        {
+            // check if we happen to be at the last week of previous year:
+            if ( tm.mon == Jan && tm.mday < 8 - wdYearStart )
+                week = wxDateTime(31, Dec, GetYear()-1).GetWeekOfYear();
+            else
+                week = (nDayInYear + wdYearStart - 1 - wdTarget)/7;
+        }
      }
  
      }
  
-    return week;
+    return (wxDateTime::wxDateTime_t)week;
  }
  
  wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
  }
  
  wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
@@ -1866,9 +2211,9 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
          // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
          // don't need it neither - because of the CHECK above we know that
          // yday lies in December then
          // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
          // don't need it neither - because of the CHECK above we know that
          // yday lies in December then
-        if ( (mon == Dec) || (yday < gs_cumulatedDays[isLeap][mon + 1]) )
+        if ( (mon == Dec) || (yday <= gs_cumulatedDays[isLeap][mon + 1]) )
          {
          {
-            Set(yday - gs_cumulatedDays[isLeap][mon], mon, year);
+            Set((wxDateTime::wxDateTime_t)(yday - gs_cumulatedDays[isLeap][mon]), mon, year);
  
              break;
          }
  
              break;
          }
@@ -1883,16 +2228,7 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
  
  double wxDateTime::GetJulianDayNumber() const
  {
  
  double wxDateTime::GetJulianDayNumber() const
  {
-    // JDN are always expressed for the GMT dates
-    Tm tm(ToTimezone(GMT0).GetTm(GMT0));
-
-    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
  }
  
  double wxDateTime::GetRataDie() const
@@ -1914,9 +2250,10 @@ int wxDateTime::IsDST(wxDateTime::Country country) const
      time_t timet = GetTicks();
      if ( timet != (time_t)-1 )
      {
      time_t timet = GetTicks();
      if ( timet != (time_t)-1 )
      {
-        tm *tm = localtime(&timet);
+        struct tm tmstruct;
+        tm *tm = wxLocaltime_r(&timet, &tmstruct);
  
  
-        wxCHECK_MSG( tm, -1, _T("localtime() failed") );
+        wxCHECK_MSG( tm, -1, _T("wxLocaltime_r() failed") );
  
          return tm->tm_isdst;
      }
  
          return tm->tm_isdst;
      }
@@ -1946,6 +2283,21 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
          secDiff -= 3600;
      }
  
          secDiff -= 3600;
      }
  
+    return Add(wxTimeSpan::Seconds(secDiff));
+}
+
+wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
+{
+    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));
  }
  
      return Subtract(wxTimeSpan::Seconds(secDiff));
  }
  
@@ -1953,24 +2305,28 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
  // wxDateTime to/from text representations
  // ----------------------------------------------------------------------------
  
  // wxDateTime to/from text representations
  // ----------------------------------------------------------------------------
  
-wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) 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
  
      // 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();
      time_t time = GetTicks();
+
      if ( (time != (time_t)-1) && !wxStrstr(format, _T("%l")) )
      {
          // use strftime()
      if ( (time != (time_t)-1) && !wxStrstr(format, _T("%l")) )
      {
          // use strftime()
-        tm *tm;
+        struct tm tmstruct;
+        struct tm *tm;
          if ( tz.GetOffset() == -GetTimeZone() )
          {
              // we are working with local time
          if ( tz.GetOffset() == -GetTimeZone() )
          {
              // we are working with local time
-            tm = localtime(&time);
+            tm = wxLocaltime_r(&time, &tmstruct);
  
              // should never happen
  
              // should never happen
-            wxCHECK_MSG( tm, wxEmptyString, _T("localtime() failed") );
+            wxCHECK_MSG( tm, wxEmptyString, _T("wxLocaltime_r() failed") );
          }
          else
          {
          }
          else
          {
@@ -1983,10 +2339,10 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
              if ( time >= 0 )
  #endif
              {
              if ( time >= 0 )
  #endif
              {
-                tm = gmtime(&time);
+                tm = wxGmtime_r(&time, &tmstruct);
  
                  // should never happen
  
                  // should never happen
-                wxCHECK_MSG( tm, wxEmptyString, _T("gmtime() failed") );
+                wxCHECK_MSG( tm, wxEmptyString, _T("wxGmtime_r() failed") );
              }
              else
              {
              }
              else
              {
@@ -1998,8 +2354,9 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
          {
              return CallStrftime(format, tm);
          }
          {
              return CallStrftime(format, tm);
          }
-        //else: use generic code below
      }
      }
+    //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
  
      // we only parse ANSI C format specifications here, no POSIX 2
      // complications, no GNU extensions but we do add support for a "%l" format
@@ -2019,7 +2376,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
      tmTimeOnly.tm_isdst = 0;        // no DST, we adjust for tz ourselves
  
      wxString tmp, res, fmt;
      tmTimeOnly.tm_isdst = 0;        // no DST, we adjust for tz ourselves
  
      wxString tmp, res, fmt;
-    for ( const wxChar *p = format; *p; p++ )
+    for ( wxString::const_iterator p = format.begin(); p != format.end(); ++p )
      {
          if ( *p != _T('%') )
          {
      {
          if ( *p != _T('%') )
          {
@@ -2030,7 +2387,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
          }
  
          // set the default format
          }
  
          // set the default format
-        switch ( *++p )
+        switch ( (*++p).GetValue() )
          {
              case _T('Y'):               // year has 4 digits
                  fmt = _T("%04d");
          {
              case _T('Y'):               // year has 4 digits
                  fmt = _T("%04d");
@@ -2053,17 +2410,17 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                  fmt = _T("%02d");
          }
  
                  fmt = _T("%02d");
          }
  
-        bool restart = TRUE;
+        bool restart = true;
          while ( restart )
          {
          while ( restart )
          {
-            restart = FALSE;
+            restart = false;
  
              // start of the format specification
  
              // start of the format specification
-            switch ( *p )
+            switch ( (*p).GetValue() )
              {
                  case _T('a'):       // a weekday name
                  case _T('A'):
              {
                  case _T('a'):       // a weekday name
                  case _T('A'):
-                    // second parameter should be TRUE for abbreviated names
+                    // second parameter should be true for abbreviated names
                      res += GetWeekDayName(tm.GetWeekDay(),
                                            *p == _T('a') ? Name_Abbr : Name_Full);
                      break;
                      res += GetWeekDayName(tm.GetWeekDay(),
                                            *p == _T('a') ? Name_Abbr : Name_Full);
                      break;
@@ -2076,6 +2433,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
  
                  case _T('c'):       // locale default date and time  representation
                  case _T('x'):       // locale default date representation
  
                  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 problem: there is no way to know what do these format
                      // specifications correspond to for the current locale.
@@ -2084,12 +2442,12 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                      // 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
                      // find the YEAR which is a year in the strftime() range (1970
                      // - 2038) whose Jan 1 falls on the same week day as the Jan 1
                      // of the real year. Then make a copy of the format and
-                    // replace all occurences of YEAR in it with some unique
+                    // 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 not appearing anywhere else in it, then use
                      // strftime() to format the date in year YEAR and then replace
                      // YEAR back by the real year and the unique replacement
-                    // string back with YEAR. Notice that "all occurences of YEAR"
-                    // means all occurences of 4 digit as well as 2 digit form!
+                    // 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
                      //
                      // the bugs: we assume that neither of %c nor %x contains any
                      // fields which may change between the YEAR and real year. For
@@ -2097,7 +2455,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                      // will change if one of these years is leap and the other one
                      // is not!
                      {
                      // will change if one of these years is leap and the other one
                      // is not!
                      {
-                        // find the YEAR: normally, for any year X, Jan 1 or the
+                        // 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
                          // 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
@@ -2139,33 +2497,15 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                              nLostWeekDays += year++ % 4 ? 1 : 2;
                          }
  
                              nLostWeekDays += year++ % 4 ? 1 : 2;
                          }
  
-                        // at any rate, we couldn't go further than 1988 + 9 + 28!
-                        wxASSERT_MSG( year < 2030,
-                                      _T("logic error in wxDateTime::Format") );
-
-                        wxString strYear, strYear2;
-                        strYear.Printf(_T("%d"), year);
-                        strYear2.Printf(_T("%d"), year % 100);
+                        // 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;
  
  
-                        // find two strings not occuring in format (this is surely
-                        // not optimal way of doing it... improvements welcome!)
-                        wxString fmt = format;
-                        wxString replacement = (wxChar)-1;
-                        while ( fmt.Find(replacement) != wxNOT_FOUND )
-                        {
-                            replacement << (wxChar)-1;
-                        }
-
-                        wxString replacement2 = (wxChar)-2;
-                        while ( fmt.Find(replacement) != wxNOT_FOUND )
-                        {
-                            replacement << (wxChar)-2;
-                        }
+                        wxASSERT_MSG( year >= 1970 && year < 2000,
+                                      _T("logic error in wxDateTime::Format") );
  
  
-                        // replace all occurences of year with it
-                        bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
-                        if ( !wasReplaced )
-                            wasReplaced = fmt.Replace(strYear2, replacement2) > 0;
  
                          // use strftime() to format the same date but in supported
                          // year
  
                          // use strftime() to format the same date but in supported
                          // year
@@ -2189,22 +2529,31 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                                                                    : _T("%x"),
                                                      &tmAdjusted);
  
                                                                    : _T("%x"),
                                                      &tmAdjusted);
  
-                        // now replace the occurence of 1999 with the real year
-                        wxString strYearReal, strYearReal2;
-                        strYearReal.Printf(_T("%04d"), yearReal);
-                        strYearReal2.Printf(_T("%02d"), yearReal % 100);
-                        str.Replace(strYear, strYearReal);
-                        str.Replace(strYear2, strYearReal2);
-
-                        // and replace back all occurences of replacement string
-                        if ( wasReplaced )
-                        {
-                            str.Replace(replacement2, strYear2);
-                            str.Replace(replacement, strYear);
-                        }
+                        // 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;
                      }
  
                          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;
  
                  case _T('d'):       // day of a month (01-31)
                      break;
  
                  case _T('d'):       // day of a month (01-31)
@@ -2241,7 +2590,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                      break;
  
                  case _T('p'):       // AM or PM string
                      break;
  
                  case _T('p'):       // AM or PM string
+#ifdef HAVE_STRFTIME
                      res += CallStrftime(_T("%p"), &tmTimeOnly);
                      res += CallStrftime(_T("%p"), &tmTimeOnly);
+#else // !HAVE_STRFTIME
+                    res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
                      break;
  
                  case _T('S'):       // second as a decimal number (00-61)
                      break;
  
                  case _T('S'):       // second as a decimal number (00-61)
@@ -2264,7 +2617,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
  
                  case _T('X'):       // locale default time representation
                      // just use strftime() to format the time for us
  
                  case _T('X'):       // locale default time representation
                      // just use strftime() to format the time for us
+#ifdef HAVE_STRFTIME
                      res += CallStrftime(_T("%X"), &tmTimeOnly);
                      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;
  
                  case _T('y'):       // year without century (00-99)
                      break;
  
                  case _T('y'):       // year without century (00-99)
@@ -2276,7 +2633,9 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                      break;
  
                  case _T('Z'):       // timezone name
                      break;
  
                  case _T('Z'):       // timezone name
+#ifdef HAVE_STRFTIME
                      res += CallStrftime(_T("%Z"), &tmTimeOnly);
                      res += CallStrftime(_T("%Z"), &tmTimeOnly);
+#endif
                      break;
  
                  default:
                      break;
  
                  default:
@@ -2288,13 +2647,13 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                          fmt += *p;
                      }
  
                          fmt += *p;
                      }
  
-                    if ( !fmt.IsEmpty() )
+                    if ( !fmt.empty() )
                      {
                          // we've only got the flags and width so far in fmt
                          fmt.Prepend(_T('%'));
                          fmt.Append(_T('d'));
  
                      {
                          // we've only got the flags and width so far in fmt
                          fmt.Prepend(_T('%'));
                          fmt.Append(_T('d'));
  
-                        restart = TRUE;
+                        restart = true;
  
                          break;
                      }
  
                          break;
                      }
@@ -2329,12 +2688,12 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
  // RFC822 time specs.
  //
  // TODO a great candidate for using reg exps
  // RFC822 time specs.
  //
  // TODO a great candidate for using reg exps
-const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
+const char *
+wxDateTime::ParseRfc822Date(const wxString& date, wxString::const_iterator *end)
  {
  {
-    wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
-
-    const wxChar *p = date;
-    const wxChar *comma = wxStrchr(p, _T(','));
+    // 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
      if ( comma )
      {
          // the part before comma is the weekday
@@ -2347,7 +2706,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
          {
              wxLogDebug(_T("no space after weekday in RFC822 time spec"));
  
          {
              wxLogDebug(_T("no space after weekday in RFC822 time spec"));
  
-            return (wxChar *)NULL;
+            return NULL;
          }
  
          p++; // skip space
          }
  
          p++; // skip space
@@ -2358,19 +2717,19 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
      {
          wxLogDebug(_T("day number expected in RFC822 time spec, none found"));
  
      {
          wxLogDebug(_T("day number expected in RFC822 time spec, none found"));
  
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      }
  
-    wxDateTime_t day = *p++ - _T('0');
+    wxDateTime_t day = (wxDateTime_t)(*p++ - _T('0'));
      if ( wxIsdigit(*p) )
      {
          day *= 10;
      if ( wxIsdigit(*p) )
      {
          day *= 10;
-        day += *p++ - _T('0');
+        day = (wxDateTime_t)(day + (*p++ - _T('0')));
      }
  
      if ( *p++ != _T(' ') )
      {
      }
  
      if ( *p++ != _T(' ') )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      // the following 3 letters specify the month
      }
  
      // the following 3 letters specify the month
@@ -2404,21 +2763,21 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
      {
          wxLogDebug(_T("Invalid RFC 822 month name '%s'"), monName.c_str());
  
      {
          wxLogDebug(_T("Invalid RFC 822 month name '%s'"), monName.c_str());
  
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      p += 3;
  
      if ( *p++ != _T(' ') )
      {
      }
  
      p += 3;
  
      if ( *p++ != _T(' ') )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      // next is the year
      if ( !wxIsdigit(*p) )
      {
          // no year?
      }
  
      // next is the year
      if ( !wxIsdigit(*p) )
      {
          // no year?
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      int year = *p++ - _T('0');
      }
  
      int year = *p++ - _T('0');
@@ -2426,7 +2785,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
      if ( !wxIsdigit(*p) )
      {
          // should have at least 2 digits in the year
      if ( !wxIsdigit(*p) )
      {
          // should have at least 2 digits in the year
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      year *= 10;
      }
  
      year *= 10;
@@ -2441,7 +2800,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
          if ( !wxIsdigit(*p) )
          {
              // no 3 digit years please
          if ( !wxIsdigit(*p) )
          {
              // no 3 digit years please
-            return (wxChar *)NULL;
+            return NULL;
          }
  
          year *= 10;
          }
  
          year *= 10;
@@ -2450,71 +2809,72 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
  
      if ( *p++ != _T(' ') )
      {
  
      if ( *p++ != _T(' ') )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      // time is in the format hh:mm:ss and seconds are optional
      if ( !wxIsdigit(*p) )
      {
      }
  
      // time is in the format hh:mm:ss and seconds are optional
      if ( !wxIsdigit(*p) )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      }
  
-    wxDateTime_t hour = *p++ - _T('0');
+    wxDateTime_t hour = (wxDateTime_t)(*p++ - _T('0'));
  
      if ( !wxIsdigit(*p) )
      {
  
      if ( !wxIsdigit(*p) )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      hour *= 10;
      }
  
      hour *= 10;
-    hour += *p++ - _T('0');
+    hour = (wxDateTime_t)(hour + (*p++ - _T('0')));
  
      if ( *p++ != _T(':') )
      {
  
      if ( *p++ != _T(':') )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      if ( !wxIsdigit(*p) )
      {
      }
  
      if ( !wxIsdigit(*p) )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      }
  
-    wxDateTime_t min = *p++ - _T('0');
+    wxDateTime_t min = (wxDateTime_t)(*p++ - _T('0'));
  
      if ( !wxIsdigit(*p) )
      {
  
      if ( !wxIsdigit(*p) )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      min *= 10;
      }
  
      min *= 10;
-    min += *p++ - _T('0');
+    min = (wxDateTime_t)(min + *p++ - _T('0'));
  
      wxDateTime_t sec = 0;
  
      wxDateTime_t sec = 0;
-    if ( *p++ == _T(':') )
+    if ( *p == _T(':') )
      {
      {
+        p++;
          if ( !wxIsdigit(*p) )
          {
          if ( !wxIsdigit(*p) )
          {
-            return (wxChar *)NULL;
+            return NULL;
          }
  
          }
  
-        sec = *p++ - _T('0');
+        sec = (wxDateTime_t)(*p++ - _T('0'));
  
          if ( !wxIsdigit(*p) )
          {
  
          if ( !wxIsdigit(*p) )
          {
-            return (wxChar *)NULL;
+            return NULL;
          }
  
          sec *= 10;
          }
  
          sec *= 10;
-        sec += *p++ - _T('0');
+        sec = (wxDateTime_t)(sec + *p++ - _T('0'));
      }
  
      if ( *p++ != _T(' ') )
      {
      }
  
      if ( *p++ != _T(' ') )
      {
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      // and now the interesting part: the timezone
      }
  
      // and now the interesting part: the timezone
-    int offset;
+    int offset wxDUMMY_INITIALIZE(0);
      if ( *p == _T('-') || *p == _T('+') )
      {
          // the explicit offset given: it has the form of hhmm
      if ( *p == _T('-') || *p == _T('+') )
      {
          // the explicit offset given: it has the form of hhmm
@@ -2522,17 +2882,17 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
  
          if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
          {
  
          if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
          {
-            return (wxChar *)NULL;
+            return NULL;
          }
  
          // hours
          }
  
          // hours
-        offset = 60*(10*(*p - _T('0')) + (*(p + 1) - _T('0')));
+        offset = MIN_PER_HOUR*(10*(*p - _T('0')) + (*(p + 1) - _T('0')));
  
          p += 2;
  
          if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
          {
  
          p += 2;
  
          if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
          {
-            return (wxChar *)NULL;
+            return NULL;
          }
  
          // minutes
          }
  
          // minutes
@@ -2564,7 +2924,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
              {
                  wxLogDebug(_T("Invalid militaty timezone '%c'"), *p);
  
              {
                  wxLogDebug(_T("Invalid militaty timezone '%c'"), *p);
  
-                return (wxChar *)NULL;
+                return NULL;
              }
  
              offset = offsets[*p++ - _T('A')];
              }
  
              offset = offsets[*p++ - _T('A')];
@@ -2599,45 +2959,210 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
              {
                  wxLogDebug(_T("Unknown RFC 822 timezone '%s'"), p);
  
              {
                  wxLogDebug(_T("Unknown RFC 822 timezone '%s'"), p);
  
-                return (wxChar *)NULL;
+                return NULL;
              }
  
              p += tz.length();
          }
  
          // make it minutes
              }
  
              p += tz.length();
          }
  
          // make it minutes
-        offset *= 60;
+        offset *= MIN_PER_HOUR;
      }
  
      }
  
-    // the spec was correct
+    // the spec was correct, construct the date from the values we found
      Set(day, mon, year, hour, min, sec);
      Set(day, mon, year, hour, min, sec);
-    MakeTimezone((wxDateTime_t)(60*offset));
+    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;
+                        }
+                }
  
  
-    return 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;
  }
  
  }
  
-const wxChar *wxDateTime::ParseFormat(const wxChar *date,
-                                      const wxChar *format,
-                                      const wxDateTime& dateDef)
+#endif // __WINDOWS__
+
+const char *
+wxDateTime::ParseFormat(const wxString& date,
+                        const wxString& format,
+                        const wxDateTime& dateDef,
+                        wxString::const_iterator *end)
  {
  {
-    wxCHECK_MSG( date && format, (wxChar *)NULL,
-                 _T("NULL pointer in wxDateTime::ParseFormat()") );
+    wxCHECK_MSG( !format.empty(), NULL, "format can't be empty" );
  
      wxString str;
      unsigned long num;
  
      // what fields have we found?
  
      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
+    bool haveWDay = false,
+         haveYDay = false,
+         haveDay = false,
+         haveMon = false,
+         haveYear = false,
+         haveHour = false,
+         haveMin = false,
+         haveSec = false;
+
+    bool hourIsIn12hFormat = false, // or in 24h one?
+         isPM = false;              // AM by default
  
      // and the value of the items we have (init them to get rid of warnings)
      wxDateTime_t sec = 0,
  
      // and the value of the items we have (init them to get rid of warnings)
      wxDateTime_t sec = 0,
@@ -2649,8 +3174,8 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
      wxDateTime::Month mon = Inv_Month;
      int year = 0;
  
      wxDateTime::Month mon = Inv_Month;
      int year = 0;
  
-    const wxChar *input = date;
-    for ( const wxChar *fmt = format; *fmt; fmt++ )
+    const wxStringCharType *input = date.wx_str();
+    for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++fmt )
      {
          if ( *fmt != _T('%') )
          {
      {
          if ( *fmt != _T('%') )
          {
@@ -2670,7 +3195,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( *input++ != *fmt )
                  {
                      // no match
                  if ( *input++ != *fmt )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
              }
  
                  }
              }
  
@@ -2682,7 +3207,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
  
          // parse the optional width
          size_t width = 0;
  
          // parse the optional width
          size_t width = 0;
-        while ( isdigit(*++fmt) )
+        while ( wxIsdigit(*++fmt) )
          {
              width *= 10;
              width += *fmt - _T('0');
          {
              width *= 10;
              width += *fmt - _T('0');
@@ -2691,7 +3216,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
          // the default widths for the various fields
          if ( !width )
          {
          // the default widths for the various fields
          if ( !width )
          {
-            switch ( *fmt )
+            switch ( (*fmt).GetValue() )
              {
                  case _T('Y'):               // year has 4 digits
                      width = 4;
              {
                  case _T('Y'):               // year has 4 digits
                      width = 4;
@@ -2713,7 +3238,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
          }
  
          // then the format itself
          }
  
          // then the format itself
-        switch ( *fmt )
+        switch ( (*fmt).GetValue() )
          {
              case _T('a'):       // a weekday name
              case _T('A'):
          {
              case _T('a'):       // a weekday name
              case _T('A'):
@@ -2723,10 +3248,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                      if ( wday == Inv_WeekDay )
                      {
                          // no match
                      if ( wday == Inv_WeekDay )
                      {
                          // no match
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
                  }
                      }
                  }
-                haveWDay = TRUE;
+                haveWDay = true;
                  break;
  
              case _T('b'):       // a month name
                  break;
  
              case _T('b'):       // a month name
@@ -2737,41 +3262,32 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                      if ( mon == Inv_Month )
                      {
                          // no match
                      if ( mon == Inv_Month )
                      {
                          // no match
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
                  }
                      }
                  }
-                haveMon = TRUE;
+                haveMon = true;
                  break;
  
              case _T('c'):       // locale default date and time  representation
                  {
                      wxDateTime dt;
  
                  break;
  
              case _T('c'):       // locale default date and time  representation
                  {
                      wxDateTime dt;
  
-                    // this is the format which corresponds to ctime() output
-                    // and strptime("%c") should parse it, so try it first
-                    static const wxChar *fmtCtime = _T("%a %b %d %H:%M:%S %Y");
-
-                    const wxChar *result = dt.ParseFormat(input, fmtCtime);
-                    if ( !result )
-                    {
-                        result = dt.ParseFormat(input, _T("%x %X"));
-                    }
-
-                    if ( !result )
-                    {
-                        result = dt.ParseFormat(input, _T("%X %x"));
-                    }
+                    const wxString inc(input);
  
  
-                    if ( !result )
+                    // 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
                      {
                          // we've tried everything and still no match
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
  
                      Tm tm = dt.GetTm();
  
                      haveDay = haveMon = haveYear =
                      }
  
                      Tm tm = dt.GetTm();
  
                      haveDay = haveMon = haveYear =
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
  
                      hour = tm.hour;
                      min = tm.min;
  
                      hour = tm.hour;
                      min = tm.min;
@@ -2781,7 +3297,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                      mon = tm.mon;
                      mday = tm.mday;
  
                      mon = tm.mon;
                      mday = tm.mday;
  
-                    input = result;
+                    input += endc - inc.begin();
                  }
                  break;
  
                  }
                  break;
  
@@ -2790,12 +3306,12 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                          (num > 31) || (num < 1) )
                  {
                      // no match
                          (num > 31) || (num < 1) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  // we can't check whether the day range is correct yet, will
                  // do it later - assume ok for now
                  }
  
                  // we can't check whether the day range is correct yet, will
                  // do it later - assume ok for now
-                haveDay = TRUE;
+                haveDay = true;
                  mday = (wxDateTime_t)num;
                  break;
  
                  mday = (wxDateTime_t)num;
                  break;
  
@@ -2803,10 +3319,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( !GetNumericToken(width, input, &num) || (num > 23) )
                  {
                      // no match
                  if ( !GetNumericToken(width, input, &num) || (num > 23) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveHour = TRUE;
+                haveHour = true;
                  hour = (wxDateTime_t)num;
                  break;
  
                  hour = (wxDateTime_t)num;
                  break;
  
@@ -2814,11 +3330,11 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
                  {
                      // no match
                  if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveHour = TRUE;
-                hourIsIn12hFormat = TRUE;
+                haveHour = true;
+                hourIsIn12hFormat = true;
                  hour = (wxDateTime_t)(num % 12);        // 12 should be 0
                  break;
  
                  hour = (wxDateTime_t)(num % 12);        // 12 should be 0
                  break;
  
@@ -2826,10 +3342,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( !GetNumericToken(width, input, &num) || !num || (num > 366) )
                  {
                      // no match
                  if ( !GetNumericToken(width, input, &num) || !num || (num > 366) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveYDay = TRUE;
+                haveYDay = true;
                  yday = (wxDateTime_t)num;
                  break;
  
                  yday = (wxDateTime_t)num;
                  break;
  
@@ -2837,10 +3353,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
                  {
                      // no match
                  if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveMon = TRUE;
+                haveMon = true;
                  mon = (Month)(num - 1);
                  break;
  
                  mon = (Month)(num - 1);
                  break;
  
@@ -2848,10 +3364,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( !GetNumericToken(width, input, &num) || (num > 59) )
                  {
                      // no match
                  if ( !GetNumericToken(width, input, &num) || (num > 59) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveMin = TRUE;
+                haveMin = true;
                  min = (wxDateTime_t)num;
                  break;
  
                  min = (wxDateTime_t)num;
                  break;
  
@@ -2860,14 +3376,16 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                      wxString am, pm, token = GetAlphaToken(input);
  
                      GetAmPmStrings(&am, &pm);
                      wxString am, pm, token = GetAlphaToken(input);
  
                      GetAmPmStrings(&am, &pm);
+                    if (am.empty() && pm.empty())
+                        return NULL;  // no am/pm strings defined
                      if ( token.CmpNoCase(pm) == 0 )
                      {
                      if ( token.CmpNoCase(pm) == 0 )
                      {
-                        isPM = TRUE;
+                        isPM = true;
                      }
                      else if ( token.CmpNoCase(am) != 0 )
                      {
                          // no match
                      }
                      else if ( token.CmpNoCase(am) != 0 )
                      {
                          // no match
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
                  }
                  break;
                      }
                  }
                  break;
@@ -2875,14 +3393,14 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
              case _T('r'):       // time as %I:%M:%S %p
                  {
                      wxDateTime dt;
              case _T('r'):       // time as %I:%M:%S %p
                  {
                      wxDateTime dt;
-                    input = dt.ParseFormat(input, _T("%I:%M:%S %p"));
+                    input = dt.ParseFormat(input, wxS("%I:%M:%S %p"));
                      if ( !input )
                      {
                          // no match
                      if ( !input )
                      {
                          // no match
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
  
                      }
  
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
  
                      Tm tm = dt.GetTm();
                      hour = tm.hour;
  
                      Tm tm = dt.GetTm();
                      hour = tm.hour;
@@ -2894,28 +3412,29 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
              case _T('R'):       // time as %H:%M
                  {
                      wxDateTime dt;
              case _T('R'):       // time as %H:%M
                  {
                      wxDateTime dt;
-                    input = dt.ParseFormat(input, _T("%H:%M"));
+                    input = dt.ParseFormat(input, wxS("%H:%M"));
                      if ( !input )
                      {
                          // no match
                      if ( !input )
                      {
                          // no match
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
  
                      }
  
-                    haveHour = haveMin = TRUE;
+                    haveHour = haveMin = true;
  
                      Tm tm = dt.GetTm();
                      hour = tm.hour;
                      min = tm.min;
                  }
  
                      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
  
              case _T('S'):       // second as a decimal number (00-61)
                  if ( !GetNumericToken(width, input, &num) || (num > 61) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveSec = TRUE;
+                haveSec = true;
                  sec = (wxDateTime_t)num;
                  break;
  
                  sec = (wxDateTime_t)num;
                  break;
  
@@ -2926,10 +3445,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                      if ( !input )
                      {
                          // no match
                      if ( !input )
                      {
                          // no match
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
  
                      }
  
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
  
                      Tm tm = dt.GetTm();
                      hour = tm.hour;
  
                      Tm tm = dt.GetTm();
                      hour = tm.hour;
@@ -2942,10 +3461,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( !GetNumericToken(width, input, &num) || (wday > 6) )
                  {
                      // no match
                  if ( !GetNumericToken(width, input, &num) || (wday > 6) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveWDay = TRUE;
+                haveWDay = true;
                  wday = (WeekDay)num;
                  break;
  
                  wday = (WeekDay)num;
                  break;
  
@@ -2957,12 +3476,13 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  {
                      struct tm tm;
  
                  {
                      struct tm tm;
  
-                    const wxChar *result = CallStrptime(input, "%x", &tm);
+                    const wxStringCharType *
+                        result = CallStrptime(input, "%x", &tm);
                      if ( result )
                      {
                          input = result;
  
                      if ( result )
                      {
                          input = result;
  
-                        haveDay = haveMon = haveYear = TRUE;
+                        haveDay = haveMon = haveYear = true;
  
                          year = 1900 + tm.tm_year;
                          mon = (Month)tm.tm_mon;
  
                          year = 1900 + tm.tm_year;
                          mon = (Month)tm.tm_mon;
@@ -2973,46 +3493,54 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  }
  #endif // HAVE_STRPTIME
  
                  }
  #endif // HAVE_STRPTIME
  
-                // TODO query the LOCALE_IDATE setting under Win32
                  {
                      wxDateTime dt;
                  {
                      wxDateTime dt;
-
-                    wxString fmtDate, fmtDateAlt;
-                    if ( IsWestEuropeanCountry(GetCountry()) ||
-                         GetCountry() == Russia )
-                    {
-                        fmtDate = _T("%d/%m/%y");
-                        fmtDateAlt = _T("%m/%d/%y");
-                    }
-                    else // assume USA
+                    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__
                      {
                      {
-                        fmtDate = _T("%m/%d/%y");
-                        fmtDateAlt = _T("%d/%m/%y");
-                    }
-
-                    const wxChar *result = dt.ParseFormat(input, fmtDate);
-
-                    if ( !result )
-                    {
-                        // ok, be nice and try another one
-                        result = dt.ParseFormat(input, fmtDateAlt);
+                        if ( 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");
+                        }
                      }
  
                      }
  
-                    if ( !result )
+                    const wxString indate(input);
+                    wxString::const_iterator endDate;
+                    if ( !dt.ParseFormat(indate, fmtDate, &endDate) )
                      {
                      {
-                        // bad luck
-                        return (wxChar *)NULL;
+                        // try another one if we have it
+                        if ( fmtDateAlt.empty() ||
+                                !dt.ParseFormat(indate, fmtDateAlt, &endDate) )
+                        {
+                            return NULL;
+                        }
                      }
  
                      Tm tm = dt.GetTm();
  
                      }
  
                      Tm tm = dt.GetTm();
  
-                    haveDay = haveMon = haveYear = TRUE;
+                    haveDay =
+                    haveMon =
+                    haveYear = true;
  
                      year = tm.year;
                      mon = tm.mon;
                      mday = tm.mday;
  
  
                      year = tm.year;
                      mon = tm.mon;
                      mday = tm.mday;
  
-                    input = result;
+                    input += endDate - indate.begin();
                  }
  
                  break;
                  }
  
                  break;
@@ -3025,10 +3553,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                      input = CallStrptime(input, "%X", &tm);
                      if ( !input )
                      {
                      input = CallStrptime(input, "%X", &tm);
                      if ( !input )
                      {
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
  
                      }
  
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour = haveMin = haveSec = true;
  
                      hour = tm.tm_hour;
                      min = tm.tm_min;
  
                      hour = tm.tm_hour;
                      min = tm.tm_min;
@@ -3044,19 +3572,22 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                      // common cases
                      wxDateTime dt;
  
                      // common cases
                      wxDateTime dt;
  
-                    const wxChar *result = dt.ParseFormat(input, _T("%T"));
+                    const wxStringCharType *
+                        result = dt.ParseFormat(input, wxS("%T"));
                      if ( !result )
                      {
                      if ( !result )
                      {
-                        result = dt.ParseFormat(input, _T("%r"));
+                        result = dt.ParseFormat(input, wxS("%r"));
                      }
  
                      if ( !result )
                      {
                          // no match
                      }
  
                      if ( !result )
                      {
                          // no match
-                        return (wxChar *)NULL;
+                        return NULL;
                      }
  
                      }
  
-                    haveHour = haveMin = haveSec = TRUE;
+                    haveHour =
+                    haveMin =
+                    haveSec = true;
  
                      Tm tm = dt.GetTm();
                      hour = tm.hour;
  
                      Tm tm = dt.GetTm();
                      hour = tm.hour;
@@ -3072,10 +3603,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( !GetNumericToken(width, input, &num) || (num > 99) )
                  {
                      // no match
                  if ( !GetNumericToken(width, input, &num) || (num > 99) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveYear = TRUE;
+                haveYear = true;
  
                  // TODO should have an option for roll over date instead of
                  //      hard coding it here
  
                  // TODO should have an option for roll over date instead of
                  //      hard coding it here
@@ -3086,10 +3617,10 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( !GetNumericToken(width, input, &num) )
                  {
                      // no match
                  if ( !GetNumericToken(width, input, &num) )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
  
                  }
  
-                haveYear = TRUE;
+                haveYear = true;
                  year = (wxDateTime_t)num;
                  break;
  
                  year = (wxDateTime_t)num;
                  break;
  
@@ -3101,7 +3632,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  if ( *input++ != _T('%') )
                  {
                      // no match
                  if ( *input++ != _T('%') )
                  {
                      // no match
-                    return (wxChar *)NULL;
+                    return NULL;
                  }
                  break;
  
                  }
                  break;
  
@@ -3111,7 +3642,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                  // fall through
  
              default:            // not a known format spec
                  // fall through
  
              default:            // not a known format spec
-                return (wxChar *)NULL;
+                return NULL;
          }
      }
  
          }
      }
  
@@ -3150,7 +3681,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
          {
              wxLogDebug(_T("bad month day in wxDateTime::ParseFormat"));
  
          {
              wxLogDebug(_T("bad month day in wxDateTime::ParseFormat"));
  
-            return (wxChar *)NULL;
+            return NULL;
          }
  
          tm.mon = mon;
          }
  
          tm.mon = mon;
@@ -3162,7 +3693,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
          {
              wxLogDebug(_T("bad year day in wxDateTime::ParseFormat"));
  
          {
              wxLogDebug(_T("bad year day in wxDateTime::ParseFormat"));
  
-            return (wxChar *)NULL;
+            return NULL;
          }
  
          Tm tm2 = wxDateTime(1, Jan, tm.year).SetToYearDay(yday).GetTm();
          }
  
          Tm tm2 = wxDateTime(1, Jan, tm.year).SetToYearDay(yday).GetTm();
@@ -3197,36 +3728,90 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
  
      Set(tm);
  
  
      Set(tm);
  
-    return input;
+    // 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 wxChar *wxDateTime::ParseDateTime(const wxChar *date)
+const char *
+wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end)
  {
  {
-    wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
+    // 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;
  
  
-    // there is a public domain version of getdate.y, but it only works for
-    // English...
-    wxFAIL_MSG(_T("TODO"));
+        const wxString datestr(endTime, date.end());
+        if ( !dtDate.ParseDate(datestr, &endDate) )
+            return NULL;
  
  
-    return (wxChar *)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 wxChar *wxDateTime::ParseDate(const wxChar *date)
+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)
  
  {
      // 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)
  
-    wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
-
-    const wxChar *p = date;
+    const wxStringCharType *p = date.wx_str();
      while ( wxIsspace(*p) )
          p++;
  
      // some special cases
      static struct
      {
      while ( wxIsspace(*p) )
          p++;
  
      // some special cases
      static struct
      {
-        const wxChar *str;
+        const char *str;
          int dayDiffFromToday;
      } literalDates[] =
      {
          int dayDiffFromToday;
      } literalDates[] =
      {
@@ -3237,21 +3822,29 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
  
      for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ )
      {
  
      for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ )
      {
-        wxString date = wxGetTranslation(literalDates[n].str);
-        size_t len = date.length();
-        if ( wxStrlen(p) >= len && (wxString(p, len).CmpNoCase(date) == 0) )
+        const wxString dateStr = wxGetTranslation(literalDates[n].str);
+        size_t len = dateStr.length();
+        if ( wxStrlen(p) >= len )
          {
          {
-            // nothing can follow this, so stop here
-            p += len;
-
-            int dayDiffFromToday = literalDates[n].dayDiffFromToday;
-            *this = Today();
-            if ( dayDiffFromToday )
+            wxString str(p, len);
+            if ( str.CmpNoCase(dateStr) == 0 )
              {
              {
-                *this += wxDateSpan::Days(dayDiffFromToday);
-            }
+                // nothing can follow this, so stop here
+                p += len;
  
  
-            return p;
+                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;
+            }
          }
      }
  
          }
      }
  
@@ -3261,10 +3854,10 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
      // have the ability to back track.
  
      // what do we have?
      // have the ability to back track.
  
      // what do we have?
-    bool haveDay = FALSE,       // the months day?
-         haveWDay = FALSE,      // the day of week?
-         haveMon = FALSE,       // the month?
-         haveYear = FALSE;      // the year?
+    bool haveDay = false,       // the months day?
+         haveWDay = false,      // the day of week?
+         haveMon = false,       // the month?
+         haveYear = false;      // the year?
  
      // and the value of the items we have (init them to get rid of warnings)
      WeekDay wday = Inv_WeekDay;
  
      // and the value of the items we have (init them to get rid of warnings)
      WeekDay wday = Inv_WeekDay;
@@ -3274,7 +3867,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
  
      // tokenize the string
      size_t nPosCur = 0;
  
      // tokenize the string
      size_t nPosCur = 0;
-    static const wxChar *dateDelimiters = _T(".,/-\t\r\n ");
+    static const wxStringCharType *dateDelimiters = wxS(".,/-\t\r\n ");
      wxStringTokenizer tok(p, dateDelimiters);
      while ( tok.HasMoreTokens() )
      {
      wxStringTokenizer tok(p, dateDelimiters);
      while ( tok.HasMoreTokens() )
      {
@@ -3288,29 +3881,42 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
          {
              // guess what this number is
  
          {
              // guess what this number is
  
-            bool isDay = FALSE,
-                 isMonth = FALSE,
-                 isYear = FALSE;
+            bool isDay = false,
+                 isMonth = false,
+                 isYear = false;
  
              if ( !haveMon && val > 0 && val <= 12 )
              {
                  // assume it is month
  
              if ( !haveMon && val > 0 && val <= 12 )
              {
                  // assume it is month
-                isMonth = TRUE;
+                isMonth = true;
              }
              else // not the month
              {
              }
              else // not the month
              {
-                wxDateTime_t maxDays = haveMon
-                    ? GetNumOfDaysInMonth(haveYear ? year : Inv_Year, mon)
-                    : 31;
-
-                // can it be day?
-                if ( (val == 0) || (val > (unsigned long)maxDays) )  // cast to shut up compiler warning in BCC
+                if ( haveDay )
                  {
                  {
-                    isYear = TRUE;
+                    // this can only be the year
+                    isYear = true;
                  }
                  }
-                else
+                else // may be either day or year
                  {
                  {
-                    isDay = TRUE;
+                    // 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;
+                    }
                  }
              }
  
                  }
              }
  
@@ -3319,7 +3925,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                  if ( haveYear )
                      break;
  
                  if ( haveYear )
                      break;
  
-                haveYear = TRUE;
+                haveYear = true;
  
                  year = (wxDateTime_t)val;
              }
  
                  year = (wxDateTime_t)val;
              }
@@ -3328,13 +3934,13 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                  if ( haveDay )
                      break;
  
                  if ( haveDay )
                      break;
  
-                haveDay = TRUE;
+                haveDay = true;
  
                  day = (wxDateTime_t)val;
              }
              else if ( isMonth )
              {
  
                  day = (wxDateTime_t)val;
              }
              else if ( isMonth )
              {
-                haveMon = TRUE;
+                haveMon = true;
  
                  mon = (Month)(val - 1);
              }
  
                  mon = (Month)(val - 1);
              }
@@ -3353,8 +3959,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                      {
                          // no need to check in month range as always < 12, but
                          // the days are counted from 1 unlike the months
                      {
                          // 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;
+                        day = (wxDateTime_t)(mon + 1);
+                        haveDay = true;
                      }
                      else
                      {
                      }
                      else
                      {
@@ -3366,12 +3972,12 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
  
                  mon = mon2;
  
  
                  mon = mon2;
  
-                haveMon = TRUE;
+                haveMon = true;
              }
              else // not a valid month name
              {
              }
              else // not a valid month name
              {
-                wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
-                if ( wday != Inv_WeekDay )
+                WeekDay wday2 = GetWeekDayFromName(token, Name_Full | Name_Abbr);
+                if ( wday2 != Inv_WeekDay )
                  {
                      // a week day
                      if ( haveWDay )
                  {
                      // a week day
                      if ( haveWDay )
@@ -3379,12 +3985,14 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                          break;
                      }
  
                          break;
                      }
  
-                    haveWDay = TRUE;
+                    wday = wday2;
+
+                    haveWDay = true;
                  }
                  else // not a valid weekday name
                  {
                      // try the ordinals
                  }
                  else // not a valid weekday name
                  {
                      // try the ordinals
-                    static const wxChar *ordinals[] =
+                    static const char *ordinals[] =
                      {
                          wxTRANSLATE("first"),
                          wxTRANSLATE("second"),
                      {
                          wxTRANSLATE("first"),
                          wxTRANSLATE("second"),
@@ -3434,7 +4042,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                          break;
                      }
  
                          break;
                      }
  
-                    haveDay = TRUE;
+                    haveDay = true;
  
                      day = (wxDateTime_t)(n + 1);
                  }
  
                      day = (wxDateTime_t)(n + 1);
                  }
@@ -3450,7 +4058,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
      {
          wxLogDebug(_T("ParseDate: no day, no weekday hence no date."));
  
      {
          wxLogDebug(_T("ParseDate: no day, no weekday hence no date."));
  
-        return (wxChar *)NULL;
+        return NULL;
      }
  
      if ( haveWDay && (haveMon || haveYear || haveDay) &&
      }
  
      if ( haveWDay && (haveMon || haveYear || haveDay) &&
@@ -3459,7 +4067,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
          // 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?)
          // 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 (wxChar *)NULL;
+        return NULL;
      }
  
      if ( !haveWDay && haveYear && !(haveDay && haveMon) )
      }
  
      if ( !haveWDay && haveYear && !(haveDay && haveMon) )
@@ -3473,15 +4081,14 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                  mon = (wxDateTime::Month)(day - 1);
  
                  // we're in the current year then
                  mon = (wxDateTime::Month)(day - 1);
  
                  // we're in the current year then
-                if ( (year > 0) &&
-                        (unsigned)year <= GetNumOfDaysInMonth(Inv_Year, mon) )
+                if ( (year > 0) && (year <= (int)GetNumOfDaysInMonth(Inv_Year, mon)) )
                  {
                  {
-                    day = year;
+                    day = (wxDateTime_t)year;
  
  
-                    haveMon = TRUE;
-                    haveYear = FALSE;
+                    haveMon = true;
+                    haveYear = false;
                  }
                  }
-                //else: no, can't exchange, leave haveMon == FALSE
+                //else: no, can't exchange, leave haveMon == false
              }
          }
  
              }
          }
  
@@ -3490,7 +4097,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
              // if we give the year, month and day must be given too
              wxLogDebug(_T("ParseDate: day and month should be specified if year is."));
  
              // if we give the year, month and day must be given too
              wxLogDebug(_T("ParseDate: day and month should be specified if year is."));
  
-            return (wxChar *)NULL;
+            return NULL;
          }
      }
  
          }
      }
  
@@ -3506,6 +4113,11 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
  
      if ( haveDay )
      {
  
      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 )
          Set(day, mon, year);
  
          if ( haveWDay )
@@ -3516,7 +4128,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                  // inconsistency detected
                  wxLogDebug(_T("ParseDate: inconsistent day/weekday."));
  
                  // inconsistency detected
                  wxLogDebug(_T("ParseDate: inconsistent day/weekday."));
  
-                return (wxChar *)NULL;
+                return NULL;
              }
          }
      }
              }
          }
      }
@@ -3536,17 +4148,20 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
          p--;
      }
  
          p--;
      }
  
-    return p;
+    const size_t endpos = p - date.wx_str();
+    if ( end )
+        *end = date.begin() + endpos;
+
+    return date.c_str() + endpos;
  }
  
  }
  
-const wxChar *wxDateTime::ParseTime(const wxChar *time)
+const char *
+wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end)
  {
  {
-    wxCHECK_MSG( time, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
-
      // first try some extra things
      static const struct
      {
      // first try some extra things
      static const struct
      {
-        const wxChar *name;
+        const char *name;
          wxDateTime_t  hour;
      } stdTimes[] =
      {
          wxDateTime_t  hour;
      } stdTimes[] =
      {
@@ -3564,56 +4179,35 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
              // casts required by DigitalMars
              Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));
  
              // casts required by DigitalMars
              Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));
  
-            return time + len;
+            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
          }
      }
  
      // try all time formats we may think about in the order from longest to
      // shortest
-
-    // 12hour with AM/PM?
-    const wxChar *result = ParseFormat(time, _T("%I:%M:%S %p"));
-
-    if ( !result )
+    static const char *timeFormats[] =
      {
      {
-        // normally, it's the same, but why not try it?
-        result = ParseFormat(time, _T("%H:%M:%S"));
-    }
-
-    if ( !result )
-    {
-        // 12hour with AM/PM but without seconds?
-        result = ParseFormat(time, _T("%I:%M %p"));
-    }
+        "%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
  
  
-    if ( !result )
-    {
-        // without seconds?
-        result = ParseFormat(time, _T("%H:%M"));
-    }
-
-    if ( !result )
-    {
-        // just the hour and AM/PM?
-        result = ParseFormat(time, _T("%I %p"));
-    }
-
-    if ( !result )
-    {
-        // just the hour?
-        result = ParseFormat(time, _T("%H"));
-    }
+        // TODO: parse timezones
+    };
  
  
-    if ( !result )
+    for ( size_t nFmt = 0; nFmt < WXSIZEOF(timeFormats); nFmt++ )
      {
      {
-        // parse the standard format: normally it is one of the formats above
-        // but it may be set to something completely different by the user
-        result = ParseFormat(time, _T("%X"));
+        const char *result = ParseFormat(time, timeFormats[nFmt], end);
+        if ( result )
+            return result;
      }
  
      }
  
-    // TODO: parse timezones
-
-    return result;
+    return NULL;
  }
  
  // ----------------------------------------------------------------------------
  }
  
  // ----------------------------------------------------------------------------
@@ -3625,10 +4219,25 @@ bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const
      return !wxDateTimeHolidayAuthority::IsHoliday(*this);
  }
  
      return !wxDateTimeHolidayAuthority::IsHoliday(*this);
  }
  
+// ============================================================================
+// wxDateSpan
+// ============================================================================
+
+wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds)
+{
+    wxDateSpan ds1(ds);
+    return ds1.Multiply(n);
+}
+
  // ============================================================================
  // wxTimeSpan
  // ============================================================================
  
  // ============================================================================
  // 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
  // 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
@@ -3658,12 +4267,13 @@ enum TimeSpanPart
  // And, to be better than MFC :-), we also have
  //  %E          number of wEeks
  //  %l          milliseconds (000 - 999)
  // And, to be better than MFC :-), we also have
  //  %E          number of wEeks
  //  %l          milliseconds (000 - 999)
-wxString wxTimeSpan::Format(const wxChar *format) const
+wxString wxTimeSpan::Format(const wxString& format) const
  {
  {
-    wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") );
+    wxCHECK_MSG( !format.empty(), wxEmptyString,
+                 _T("NULL format in wxTimeSpan::Format") );
  
      wxString str;
  
      wxString str;
-    str.Alloc(wxStrlen(format));
+    str.Alloc(format.length());
  
      // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */)
      //
  
      // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */)
      //
@@ -3681,18 +4291,21 @@ wxString wxTimeSpan::Format(const wxChar *format) const
      // we remember the most important unit found so far
      TimeSpanPart partBiggest = Part_MSec;
  
      // we remember the most important unit found so far
      TimeSpanPart partBiggest = Part_MSec;
  
-    for ( const wxChar *pch = format; *pch; pch++ )
+    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
      {
          wxChar ch = *pch;
  
          if ( ch == _T('%') )
          {
              // the start of the format specification of the printf() below
-            wxString fmtPrefix = _T('%');
+            wxString fmtPrefix(_T('%'));
  
              // the number
              long n;
  
  
              // 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 )
              {
              ch = *++pch;    // get the format spec char
              switch ( ch )
              {
@@ -3727,6 +4340,13 @@ wxString wxTimeSpan::Format(const wxChar *format) const
                      n = GetHours();
                      if ( partBiggest < Part_Hour )
                      {
                      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
                          n %= HOURS_PER_DAY;
                      }
                      else
@@ -3734,25 +4354,31 @@ wxString wxTimeSpan::Format(const wxChar *format) const
                          partBiggest = Part_Hour;
                      }
  
                          partBiggest = Part_Hour;
                      }
  
-                    fmtPrefix += _T("02");
+                    digits = 2;
                      break;
  
                  case _T('l'):
                      n = GetMilliseconds().ToLong();
                      if ( partBiggest < Part_MSec )
                      {
                      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
  
                          n %= 1000;
                      }
                      //else: no need to reset partBiggest to Part_MSec, it is
                      //      the least significant one anyhow
  
-                    fmtPrefix += _T("03");
+                    digits = 3;
                      break;
  
                  case _T('M'):
                      n = GetMinutes();
                      if ( partBiggest < Part_Min )
                      {
                      break;
  
                  case _T('M'):
                      n = GetMinutes();
                      if ( partBiggest < Part_Min )
                      {
+                        if ( n < 0 )
+                            n = -n;
+
                          n %= MIN_PER_HOUR;
                      }
                      else
                          n %= MIN_PER_HOUR;
                      }
                      else
@@ -3760,13 +4386,16 @@ wxString wxTimeSpan::Format(const wxChar *format) const
                          partBiggest = Part_Min;
                      }
  
                          partBiggest = Part_Min;
                      }
  
-                    fmtPrefix += _T("02");
+                    digits = 2;
                      break;
  
                  case _T('S'):
                      n = GetSeconds().ToLong();
                      if ( partBiggest < Part_Sec )
                      {
                      break;
  
                  case _T('S'):
                      n = GetSeconds().ToLong();
                      if ( partBiggest < Part_Sec )
                      {
+                        if ( n < 0 )
+                            n = -n;
+
                          n %= SEC_PER_MIN;
                      }
                      else
                          n %= SEC_PER_MIN;
                      }
                      else
@@ -3774,10 +4403,19 @@ wxString wxTimeSpan::Format(const wxChar *format) const
                          partBiggest = Part_Sec;
                      }
  
                          partBiggest = Part_Sec;
                      }
  
-                    fmtPrefix += _T("02");
+                    digits = 2;
                      break;
              }
  
                      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
              str += wxString::Format(fmtPrefix + _T("ld"), n);
          }
          else
@@ -3796,7 +4434,7 @@ wxString wxTimeSpan::Format(const wxChar *format) const
  
  #include "wx/arrimpl.cpp"
  
  
  #include "wx/arrimpl.cpp"
  
-WX_DEFINE_OBJARRAY(wxDateTimeArray);
+WX_DEFINE_OBJARRAY(wxDateTimeArray)
  
  static int wxCMPFUNC_CONV
  wxDateTimeCompareFunc(wxDateTime **first, wxDateTime **second)
  
  static int wxCMPFUNC_CONV
  wxDateTimeCompareFunc(wxDateTime **first, wxDateTime **second)
@@ -3816,16 +4454,16 @@ wxHolidayAuthoritiesArray wxDateTimeHolidayAuthority::ms_authorities;
  /* static */
  bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
  {
  /* static */
  bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
  {
-    size_t count = ms_authorities.GetCount();
+    size_t count = ms_authorities.size();
      for ( size_t n = 0; n < count; n++ )
      {
          if ( ms_authorities[n]->DoIsHoliday(dt) )
          {
      for ( size_t n = 0; n < count; n++ )
      {
          if ( ms_authorities[n]->DoIsHoliday(dt) )
          {
-            return TRUE;
+            return true;
          }
      }
  
          }
      }
  
-    return FALSE;
+    return false;
  }
  
  /* static */
  }
  
  /* static */
@@ -3836,10 +4474,10 @@ wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart,
  {
      wxDateTimeArray hol;
  
  {
      wxDateTimeArray hol;
  
-    holidays.Empty();
+    holidays.Clear();
  
  
-    size_t count = ms_authorities.GetCount();
-    for ( size_t nAuth = 0; nAuth < count; nAuth++ )
+    const size_t countAuth = ms_authorities.size();
+    for ( size_t nAuth = 0; nAuth < countAuth; nAuth++ )
      {
          ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
  
      {
          ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
  
@@ -3848,7 +4486,7 @@ wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart,
  
      holidays.Sort(wxDateTimeCompareFunc);
  
  
      holidays.Sort(wxDateTimeCompareFunc);
  
-    return holidays.GetCount();
+    return holidays.size();
  }
  
  /* static */
  }
  
  /* static */
@@ -3860,12 +4498,12 @@ void wxDateTimeHolidayAuthority::ClearAllAuthorities()
  /* static */
  void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
  {
  /* static */
  void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
  {
-    ms_authorities.Add(auth);
+    ms_authorities.push_back(auth);
  }
  
  wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
  {
  }
  
  wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
  {
-    // nothing to do here
+    // required here for Darwin
  }
  
  // ----------------------------------------------------------------------------
  }
  
  // ----------------------------------------------------------------------------
@@ -3913,4 +4551,72 @@ size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
      return holidays.GetCount();
  }
  
      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);
+}
+
+#ifdef __WXMSW__
+
+wxDateTime& wxDateTime::SetFromMSWSysTime(const SYSTEMTIME& st)
+{
+    return Set(st.wDay,
+            wx_static_cast(wxDateTime::Month, wxDateTime::Jan + st.wMonth - 1),
+            st.wYear,
+            0, 0, 0);
+}
+
+void wxDateTime::GetAsMSWSysTime(SYSTEMTIME* st) const
+{
+    const wxDateTime::Tm tm(GetTm());
+
+    st->wYear = (WXWORD)tm.year;
+    st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
+    st->wDay = tm.mday;
+
+    st->wDayOfWeek =
+    st->wHour =
+    st->wMinute =
+    st->wSecond =
+    st->wMilliseconds = 0;
+}
+#endif // __WXMSW__
+
  #endif // wxUSE_DATETIME
  #endif // wxUSE_DATETIME