Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 0832f5379f7cfe7859ba1e2a9d1516bbb4b6c4ef..906710008547363daaa90a9febf0e6eadb651763 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -16,10 +16,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-// TODO: for $DEITY sake, someone please fix the #ifdef __WXWINCE__ everywhere,
-//       the proper way to do it is to implement (subset of) wxStrftime() for
-//       CE instead of this horror!!
-

 /*
  * Implementation notes:
  *
 /*
  * Implementation notes:
  *


@@ -66,20 +62,23 @@
 #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/intl.h"
     #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
     #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
 
 #include "wx/thread.h"
 #include "wx/tokenzr.h"
 #endif // WX_PRECOMP
 
 #include "wx/thread.h"
 #include "wx/tokenzr.h"

-#include "wx/module.h"

 
 #include <ctype.h>
 
 #ifdef __WINDOWS__
 
 #include <ctype.h>
 
 #ifdef __WINDOWS__

-    #include "wx/msw/wrapwin.h"

     #include <winnls.h>
     #ifndef __WXWINCE__
         #include <locale.h>
     #include <winnls.h>
     #ifndef __WXWINCE__
         #include <locale.h>


@@ -139,6 +138,13 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
     #include <wtime.h>
 #endif
 
     #include <wtime.h>
 #endif
 

+// define a special symbol for VC8 instead of writing tests for 1400 repeatedly
+#ifdef __VISUALC__
+    #if __VISUALC__ >= 1400
+        #define __VISUALC8__
+    #endif
+#endif
+

 #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
     #if defined(__WXPALMOS__)
         #define WX_GMTOFF_IN_TM
 #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
     #if defined(__WXPALMOS__)
         #define WX_GMTOFF_IN_TM


@@ -164,11 +170,35 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
         #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__)
+        #define WX_TIMEZONE _timezone

     #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
 #if (!defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)) && wxUSE_THREADS && !defined(__WINDOWS__)
 static wxMutex timeLock;
 #endif


@@ -181,10 +211,21 @@ struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp)
   // thread local storage for localtime anyway.
   wxMutexLocker locker(timeLock);
 #endif
   // thread local storage for localtime anyway.
   wxMutexLocker locker(timeLock);
 #endif

-  memcpy(temp, localtime(ticks), sizeof(struct tm));
+
+  // 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;
 }
   return temp;
 }

-#endif
+#endif // !HAVE_LOCALTIME_R

 
 #ifndef HAVE_GMTIME_R
 struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)
 
 #ifndef HAVE_GMTIME_R
 struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)


@@ -194,10 +235,22 @@ struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)
   // using thread local storage for gmtime anyway.
   wxMutexLocker locker(timeLock);
 #endif
   // 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;
 }
   memcpy(temp, gmtime(ticks), sizeof(struct tm));
   return temp;
 }

-#endif
+#endif // !HAVE_GMTIME_R
+
+#endif // wxWinCE with VC8/other platforms

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -395,9 +448,10 @@ static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
             - JDN_OFFSET;
 }
 
             - JDN_OFFSET;
 }
 

-#ifndef __WXWINCE__
+#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];
     // Create temp wxString here to work around mingw/cygwin bug 1046059
 {
     wxChar buf[4096];
     // Create temp wxString here to work around mingw/cygwin bug 1046059


@@ -413,7 +467,8 @@ static wxString CallStrftime(const wxChar *format, const tm* tm)
     s = buf;
     return s;
 }
     s = buf;
     return s;
 }

-#endif
+
+#endif // HAVE_STRFTIME

 
 #ifdef HAVE_STRPTIME
 
 
 #ifdef HAVE_STRPTIME
 


@@ -627,7 +682,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::wxDateTime_t)((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)


@@ -719,6 +774,7 @@ 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;
 
             m_offset = 3600*(tz - wxDateTime::GMT0);
             break;
 


@@ -869,7 +925,7 @@ wxString wxDateTime::GetMonthName(wxDateTime::Month month,
                                   wxDateTime::NameFlags flags)
 {
     wxCHECK_MSG( month != Inv_Month, wxEmptyString, _T("invalid month") );
                                   wxDateTime::NameFlags flags)
 {
     wxCHECK_MSG( month != Inv_Month, wxEmptyString, _T("invalid month") );

-#ifndef __WXWINCE__
+#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;


@@ -877,7 +933,7 @@ 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
+#else // !HAVE_STRFTIME

     wxString ret;
     switch(month)
     {
     wxString ret;
     switch(month)
     {


@@ -919,7 +975,7 @@ wxString wxDateTime::GetMonthName(wxDateTime::Month month,
             break;
     }
     return ret;
             break;
     }
     return ret;

-#endif
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME

 }
 
 /* static */
 }
 
 /* static */


@@ -927,7 +983,7 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
                                     wxDateTime::NameFlags flags)
 {
     wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, _T("invalid weekday") );
                                     wxDateTime::NameFlags flags)
 {
     wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, _T("invalid weekday") );

-#ifndef __WXWINCE__
+#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!)
     // 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!)


@@ -945,7 +1001,7 @@ 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
+#else // !HAVE_STRFTIME

     wxString ret;
     switch(wday)
     {
     wxString ret;
     switch(wday)
     {


@@ -972,8 +1028,7 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
             break;
     }
     return ret;
             break;
     }
     return ret;

-
-#endif
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME

 }
 
 /* static */
 }
 
 /* static */


@@ -1051,9 +1106,9 @@ wxDateTime::Country wxDateTime::GetCountry()
             ms_country = USA;
         }
     }
             ms_country = USA;
         }
     }

-#else
+#else // __WXWINCE__

      ms_country = USA;
      ms_country = USA;

-#endif
+#endif // !__WXWINCE__/__WXWINCE__

 
     return ms_country;
 }
 
     return ms_country;
 }


@@ -1463,6 +1518,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
 // ----------------------------------------------------------------------------


@@ -2214,13 +2279,16 @@ wxDateTime& wxDateTime::MakeFromTimezone(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, wxEmptyString, _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()


@@ -2255,15 +2323,14 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                 tm = (struct tm *)NULL;
             }
         }
                 tm = (struct tm *)NULL;
             }
         }

-#ifndef __WXWINCE__
-    //Windows CE doesn't support strftime or wcsftime, so we use the generic implementation
+

         if ( tm )
         {
             return CallStrftime(format, tm);
         }
         if ( tm )
         {
             return CallStrftime(format, tm);
         }

-#endif
-        //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


@@ -2283,7 +2350,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('%') )
         {


@@ -2294,7 +2361,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");


@@ -2323,7 +2390,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
             restart = false;
 
             // start of the format specification
             restart = false;
 
             // 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'):


@@ -2340,7 +2407,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

-#ifndef __WXWINCE__
+#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.


@@ -2438,7 +2505,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                         // replace all occurrences of year with it
                         bool wasReplaced = fmt2.Replace(strYear, replacement) > 0;
                         // evaluation order ensures we always attempt the replacement.
                         // replace all occurrences of year with it
                         bool wasReplaced = fmt2.Replace(strYear, replacement) > 0;
                         // evaluation order ensures we always attempt the replacement.

-                        wasReplaced = (fmt2.Replace(strYear2, replacement2) > 0) | wasReplaced ;
+                        wasReplaced = (fmt2.Replace(strYear2, replacement2) > 0) || wasReplaced;

 
                         // use strftime() to format the same date but in supported
                         // year
 
                         // use strftime() to format the same date but in supported
                         // year


@@ -2484,11 +2551,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
 
                         res += str;
                     }
 
                         res += str;
                     }

-#else
-                    //Use "%m/%d/%y %H:%M:%S" format instead
+#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);
                     res += wxString::Format(wxT("%02d/%02d/%04d %02d:%02d:%02d"),
                             tm.mon+1,tm.mday, tm.year, tm.hour, tm.min, tm.sec);

-#endif
+#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)


@@ -2525,11 +2592,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

-#ifndef __WXWINCE__
+#ifdef HAVE_STRFTIME

                     res += CallStrftime(_T("%p"), &tmTimeOnly);
                     res += CallStrftime(_T("%p"), &tmTimeOnly);

-#else
+#else // !HAVE_STRFTIME

                     res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");
                     res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");

-#endif
+#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)


@@ -2552,11 +2619,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

-#ifndef __WXWINCE__
+#ifdef HAVE_STRFTIME

                     res += CallStrftime(_T("%X"), &tmTimeOnly);
                     res += CallStrftime(_T("%X"), &tmTimeOnly);

-#else
+#else // !HAVE_STRFTIME

                     res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec);
                     res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec);

-#endif
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME

                     break;
 
                 case _T('y'):       // year without century (00-99)
                     break;
 
                 case _T('y'):       // year without century (00-99)


@@ -2568,7 +2635,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
                     break;
 
                 case _T('Z'):       // timezone name
                     break;
 
                 case _T('Z'):       // timezone name

-#ifndef __WXWINCE__
+#ifdef HAVE_STRFTIME

                     res += CallStrftime(_T("%Z"), &tmTimeOnly);
 #endif
                     break;
                     res += CallStrftime(_T("%Z"), &tmTimeOnly);
 #endif
                     break;


@@ -3071,10 +3138,10 @@ static wxString GetLocaleDateFormat()
 #endif // __WINDOWS__
 
 const wxChar *wxDateTime::ParseFormat(const wxChar *date,
 #endif // __WINDOWS__
 
 const wxChar *wxDateTime::ParseFormat(const wxChar *date,

-                                      const wxChar *format,
+                                      const wxString& format,

                                       const wxDateTime& dateDef)
 {
                                       const wxDateTime& dateDef)
 {

-    wxCHECK_MSG( date && format, (wxChar *)NULL,
+    wxCHECK_MSG( date && !format.empty(), (wxChar *)NULL,

                  _T("NULL pointer in wxDateTime::ParseFormat()") );
 
     wxString str;
                  _T("NULL pointer in wxDateTime::ParseFormat()") );
 
     wxString str;


@@ -3104,7 +3171,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
     int year = 0;
 
     const wxChar *input = date;
     int year = 0;
 
     const wxChar *input = date;

-    for ( const wxChar *fmt = format; *fmt; fmt++ )
+    for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++fmt )

     {
         if ( *fmt != _T('%') )
         {
     {
         if ( *fmt != _T('%') )
         {


@@ -3145,7 +3212,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;


@@ -3167,7 +3234,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'):


@@ -4204,12 +4271,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, wxEmptyString, _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 */)
     //


@@ -4227,7 +4295,7 @@ 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;
 
     {
         wxChar ch = *pch;