fix compilation error for wxUSE_DC_CACHEING==0; use more descriptive variables names

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 087db34e896d60791daf945c9aa7df13c3c86435..98e755a60150d1753763d043f04dca860ca945db 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -368,8 +368,8 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
 // global data
 // ----------------------------------------------------------------------------
 
 // global data
 // ----------------------------------------------------------------------------
 

-const wxChar * wxDefaultDateTimeFormat = wxT("%c");
-const wxChar * wxDefaultTimeSpanFormat = wxT("%H:%M:%S");
+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
 
 // in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
 // indicate an invalid wxDateTime object


@@ -511,13 +511,13 @@ static wxString CallStrftime(const wxString& format, const tm* tm)
 #endif
 
 // Unicode-friendly strptime() wrapper
 #endif
 
 // 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;


@@ -527,7 +527,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


@@ -643,7 +643,9 @@ struct tm *wxDateTime::GetTmNow(struct tm *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;


@@ -659,7 +661,7 @@ static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *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) )


@@ -1607,6 +1609,7 @@ unsigned long wxDateTime::GetAsDOS() const
     time_t ticks = GetTicks();
     struct tm tmstruct;
     struct tm *tm = wxLocaltime_r(&ticks, &tmstruct);
     time_t ticks = GetTicks();
     struct tm tmstruct;
     struct tm *tm = wxLocaltime_r(&ticks, &tmstruct);

+    wxCHECK_MSG( tm, ULONG_MAX, _T("time can't be represented in DOS format") );

 
     long year = tm->tm_year;
     year -= 80;
 
     long year = tm->tm_year;
     year -= 80;


@@ -2688,12 +2691,12 @@ wxString wxDateTime::Format(const wxString& 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


@@ -2706,7 +2709,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


@@ -2717,7 +2720,7 @@ 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 = (wxDateTime_t)(*p++ - _T('0'));
     }
 
     wxDateTime_t day = (wxDateTime_t)(*p++ - _T('0'));


@@ -2729,7 +2732,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
 
     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


@@ -2763,21 +2766,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');


@@ -2785,7 +2788,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;


@@ -2800,7 +2803,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;


@@ -2809,20 +2812,20 @@ 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 = (wxDateTime_t)(*p++ - _T('0'));
 
     if ( !wxIsdigit(*p) )
     {
     }
 
     wxDateTime_t hour = (wxDateTime_t)(*p++ - _T('0'));
 
     if ( !wxIsdigit(*p) )
     {

-        return (wxChar *)NULL;
+        return NULL;

     }
 
     hour *= 10;
     }
 
     hour *= 10;


@@ -2830,19 +2833,19 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
 
     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 = (wxDateTime_t)(*p++ - _T('0'));
 
     if ( !wxIsdigit(*p) )
     {
     }
 
     wxDateTime_t min = (wxDateTime_t)(*p++ - _T('0'));
 
     if ( !wxIsdigit(*p) )
     {

-        return (wxChar *)NULL;
+        return NULL;

     }
 
     min *= 10;
     }
 
     min *= 10;


@@ -2853,14 +2856,14 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
     {
         if ( !wxIsdigit(*p) )
         {
     {
         if ( !wxIsdigit(*p) )
         {

-            return (wxChar *)NULL;
+            return NULL;

         }
 
         sec = (wxDateTime_t)(*p++ - _T('0'));
 
         if ( !wxIsdigit(*p) )
         {
         }
 
         sec = (wxDateTime_t)(*p++ - _T('0'));
 
         if ( !wxIsdigit(*p) )
         {

-            return (wxChar *)NULL;
+            return NULL;

         }
 
         sec *= 10;
         }
 
         sec *= 10;


@@ -2869,7 +2872,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
 
     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


@@ -2881,7 +2884,7 @@ 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


@@ -2891,7 +2894,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
 
         if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
         {
 
         if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
         {

-            return (wxChar *)NULL;
+            return NULL;

         }
 
         // minutes
         }
 
         // minutes


@@ -2923,7 +2926,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')];


@@ -2958,7 +2961,7 @@ 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();
             }
 
             p += tz.length();


@@ -2970,9 +2973,13 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
 
     // the spec was correct, construct the date from the values we found
     Set(day, mon, year, hour, min, sec);
 
     // the spec was correct, construct the date from the values we found
     Set(day, mon, year, hour, min, sec);

-    MakeFromTimezone(TimeZone((wxDateTime_t)(offset*SEC_PER_MIN)));
+    MakeFromTimezone(TimeZone::Make(offset*SEC_PER_MIN));

 
 

-    return p;
+    const size_t endpos = p - date.wx_str();
+    if ( end )
+        *end = date.begin() + endpos;
+
+    return date.c_str() + endpos;

 }
 
 #ifdef __WINDOWS__
 }
 
 #ifdef __WINDOWS__


@@ -3135,12 +3142,13 @@ static wxString GetLocaleDateFormat()
 
 #endif // __WINDOWS__
 
 
 #endif // __WINDOWS__
 

-const wxChar *wxDateTime::ParseFormat(const wxChar *date,
-                                      const wxString& format,
-                                      const wxDateTime& dateDef)
+const char *
+wxDateTime::ParseFormat(const wxString& date,
+                        const wxString& format,
+                        const wxDateTime& dateDef,
+                        wxString::const_iterator *end)

 {
 {

-    wxCHECK_MSG( date && !format.empty(), (wxChar *)NULL,
-                 _T("NULL pointer in wxDateTime::ParseFormat()") );
+    wxCHECK_MSG( !format.empty(), NULL, "format can't be empty" );

 
     wxString str;
     unsigned long num;
 
     wxString str;
     unsigned long num;


@@ -3168,7 +3176,7 @@ 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;
+    const wxStringCharType *input = date.wx_str();

     for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++fmt )
     {
         if ( *fmt != _T('%') )
     for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++fmt )
     {
         if ( *fmt != _T('%') )


@@ -3189,7 +3197,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 if ( *input++ != *fmt )
                 {
                     // no match
                 if ( *input++ != *fmt )
                 {
                     // no match

-                    return (wxChar *)NULL;
+                    return NULL;

                 }
             }
 
                 }
             }
 


@@ -3242,7 +3250,7 @@ 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;


@@ -3256,7 +3264,7 @@ 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;


@@ -3266,25 +3274,16 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 {
                     wxDateTime dt;
 
                 {
                     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"));
-                    }
+                    const wxString inc(input);

 
 

-                    if ( !result )
-                    {
-                        result = dt.ParseFormat(input, _T("%X %x"));
-                    }
-
-                    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();
                     }
 
                     Tm tm = dt.GetTm();


@@ -3300,7 +3299,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;
 


@@ -3309,7 +3308,7 @@ 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
                 }
 
                 // we can't check whether the day range is correct yet, will


@@ -3322,7 +3321,7 @@ 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;


@@ -3333,7 +3332,7 @@ 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;
                 }
 
                 haveHour = true;


@@ -3345,7 +3344,7 @@ 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;


@@ -3356,7 +3355,7 @@ 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;


@@ -3367,7 +3366,7 @@ 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;


@@ -3380,7 +3379,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
 
                     GetAmPmStrings(&am, &pm);
                     if (am.empty() && pm.empty())
 
                     GetAmPmStrings(&am, &pm);
                     if (am.empty() && pm.empty())

-                        return (wxChar *)NULL;  // no am/pm strings defined
+                        return NULL;  // no am/pm strings defined

                     if ( token.CmpNoCase(pm) == 0 )
                     {
                         isPM = true;
                     if ( token.CmpNoCase(pm) == 0 )
                     {
                         isPM = true;


@@ -3388,7 +3387,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     else if ( token.CmpNoCase(am) != 0 )
                     {
                         // no match
                     else if ( token.CmpNoCase(am) != 0 )
                     {
                         // no match

-                        return (wxChar *)NULL;
+                        return NULL;

                     }
                 }
                 break;
                     }
                 }
                 break;


@@ -3396,11 +3395,11 @@ 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;


@@ -3415,11 +3414,11 @@ 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;


@@ -3434,7 +3433,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                 if ( !GetNumericToken(width, input, &num) || (num > 61) )
                 {
                     // no match
                 if ( !GetNumericToken(width, input, &num) || (num > 61) )
                 {
                     // no match

-                    return (wxChar *)NULL;
+                    return NULL;

                 }
 
                 haveSec = true;
                 }
 
                 haveSec = true;


@@ -3448,7 +3447,7 @@ 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;


@@ -3464,7 +3463,7 @@ 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;


@@ -3479,7 +3478,8 @@ 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;


@@ -3505,7 +3505,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                     // Windows for the right way of formatting the date:
                     fmtDate = GetLocaleDateFormat();
                     if ( fmtDate.empty() )
                     // Windows for the right way of formatting the date:
                     fmtDate = GetLocaleDateFormat();
                     if ( fmtDate.empty() )

-#endif
+#endif // __WINDOWS__

                     {
                         if ( IsWestEuropeanCountry(GetCountry()) ||
                              GetCountry() == Russia )
                     {
                         if ( IsWestEuropeanCountry(GetCountry()) ||
                              GetCountry() == Russia )


@@ -3520,29 +3520,29 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
                         }
                     }
 
                         }
                     }
 

-                    const wxChar *result = dt.ParseFormat(input, fmtDate);
-
-                    if ( !result && !fmtDateAlt.empty() )
-                    {
-                        // ok, be nice and try another one
-                        result = dt.ParseFormat(input, fmtDateAlt);
-                    }
-
-                    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;


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


@@ -3574,19 +3574,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;


@@ -3602,7 +3605,7 @@ 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;


@@ -3616,7 +3619,7 @@ 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;


@@ -3631,7 +3634,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;
 


@@ -3641,7 +3644,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;

         }
     }
 
         }
     }
 


@@ -3680,7 +3683,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;


@@ -3692,7 +3695,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();


@@ -3735,66 +3738,75 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
         return NULL;
     }
 
         return NULL;
     }
 

-    return input;
+    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();
 
     // 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();
 

-    const wxChar* pchTime;
-
-    // Try to parse the beginning of the string as a date
-    const wxChar* pchDate = dtDate.ParseDate(date);
+    wxString::const_iterator
+        endTime,
+        endDate,
+        endBoth;

 
 

-    // We got a date in the beginning, see if there is a time specified after the date
-    if ( pchDate )
+    // 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
     {
         // Skip spaces, as the ParseTime() function fails on spaces

-        while ( wxIsspace(*pchDate) )
-            pchDate++;
+        while ( endDate != date.end() && wxIsspace(*endDate) )
+            ++endDate;

 
 

-        pchTime = dtTime.ParseTime(pchDate);
+        const wxString timestr(endDate, date.end());
+        if ( !dtTime.ParseTime(timestr, &endTime) )
+            return NULL;
+
+        endBoth = endDate + (endTime - timestr.begin());

     }
     else // no date in the beginning
     {
     }
     else // no date in the beginning
     {

-        // check and see if we have a time followed by a date
-        pchTime = dtTime.ParseTime(date);
-        if ( pchTime )
-        {
-            while ( wxIsspace(*pchTime) )
-                pchTime++;
+        // check if we have a time followed by a date
+        if ( !dtTime.ParseTime(date, &endTime) )
+            return NULL;

 
 

-            pchDate = dtDate.ParseDate(pchTime);
-        }
-    }
+        while ( endTime != date.end() && wxIsspace(*endTime) )
+            ++endTime;

 
 

-    // If we have a date specified, set our own data to the same date
-    if ( !pchDate || !pchTime )
-        return NULL;
+        const wxString datestr(endTime, date.end());
+        if ( !dtDate.ParseDate(datestr, &endDate) )
+            return NULL;
+
+        endBoth = endTime + (endDate - datestr.begin());
+    }

 
     Set(dtDate.GetDay(), dtDate.GetMonth(), dtDate.GetYear(),
         dtTime.GetHour(), dtTime.GetMinute(), dtTime.GetSecond(),
         dtTime.GetMillisecond());
 
     // Return endpoint of scan
 
     Set(dtDate.GetDay(), dtDate.GetMonth(), dtDate.GetYear(),
         dtTime.GetHour(), dtTime.GetMinute(), dtTime.GetSecond(),
         dtTime.GetMillisecond());
 
     // Return endpoint of scan

-    return pchDate > pchTime ? pchDate : pchTime;
+    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++;
 
     while ( wxIsspace(*p) )
         p++;
 


@@ -3829,7 +3841,11 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                     *this += wxDateSpan::Days(dayDiffFromToday);
                 }
 
                     *this += wxDateSpan::Days(dayDiffFromToday);
                 }
 

-                return p;
+                const size_t endpos = p - date.wx_str();
+
+                if ( end )
+                    *end = date.begin() + endpos;
+                return date.c_str() + endpos;

             }
         }
     }
             }
         }
     }


@@ -3853,7 +3869,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() )
     {


@@ -3962,8 +3978,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
             }
             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 )


@@ -3971,6 +3987,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                         break;
                     }
 
                         break;
                     }
 

+                    wday = wday2;
+

                     haveWDay = true;
                 }
                 else // not a valid weekday name
                     haveWDay = true;
                 }
                 else // not a valid weekday name


@@ -4112,7 +4130,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;

             }
         }
     }
             }
         }
     }


@@ -4132,13 +4150,16 @@ 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
     {


@@ -4160,56 +4181,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 )
-    {
-        // normally, it's the same, but why not try it?
-        result = ParseFormat(time, _T("%H:%M:%S"));
-    }
-
-    if ( !result )
+    static const char *timeFormats[] =

     {
     {

-        // 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;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------