#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
#ifndef WX_PRECOMP
- #ifdef __WXMSW__
+ #ifdef __WINDOWS__
#include "wx/msw/wrapwin.h"
#endif
#include "wx/string.h"
#endif
#include "wx/datetime.h"
+#include "wx/time.h"
// ============================================================================
// implementation of wxDateTime
extern void InitTm(struct tm& tm);
-extern int GetTimeZone();
-
extern wxString CallStrftime(const wxString& format, const tm* tm);
// ----------------------------------------------------------------------------
const wxString str(p, end);
wxString::const_iterator endParse;
wxDateTime dt;
- if ( dt.ParseFormat(str, fmt, &endParse) ||
- (!fmtAlt.empty() && dt.ParseFormat(str, fmtAlt, &endParse)) )
+
+ // Use a default date outside of the DST period to avoid problems with
+ // parsing the time differently depending on the today's date (which is used
+ // as the fall back date if none is explicitly specified).
+ static const wxDateTime dtDef(1, wxDateTime::Jan, 2012);
+
+ if ( dt.ParseFormat(str, fmt, dtDef, &endParse) ||
+ (!fmtAlt.empty() && dt.ParseFormat(str, fmtAlt, dtDef, &endParse)) )
{
p += endParse - str.begin();
}
wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
{
wxCHECK_MSG( !formatp.empty(), wxEmptyString,
- _T("NULL format in wxDateTime::Format") );
+ wxT("NULL format in wxDateTime::Format") );
wxString format = formatp;
#ifdef __WXOSX__
format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT));
#endif
// 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
+ // strftime() or if we use non standard specifiers (notice that "%z" is
+ // special because it is de facto standard under Unix but is not supported
+ // under Windows)
+#ifdef wxHAS_STRFTIME
time_t time = GetTicks();
- if ( (time != (time_t)-1) && !wxStrstr(format, _T("%l")) )
+ if ( (time != (time_t)-1) && !wxStrstr(format, wxT("%l"))
+#ifdef __WINDOWS__
+ && !wxStrstr(format, wxT("%z"))
+#endif
+ )
{
// use strftime()
struct tm tmstruct;
struct tm *tm;
- if ( tz.GetOffset() == -GetTimeZone() )
+ if ( tz.GetOffset() == -wxGetTimeZone() )
{
// we are working with local time
tm = wxLocaltime_r(&time, &tmstruct);
// should never happen
- wxCHECK_MSG( tm, wxEmptyString, _T("wxLocaltime_r() failed") );
+ wxCHECK_MSG( tm, wxEmptyString, wxT("wxLocaltime_r() failed") );
}
else
{
tm = wxGmtime_r(&time, &tmstruct);
// should never happen
- wxCHECK_MSG( tm, wxEmptyString, _T("wxGmtime_r() failed") );
+ wxCHECK_MSG( tm, wxEmptyString, wxT("wxGmtime_r() failed") );
}
else
{
}
}
//else: use generic code below
-#endif // HAVE_STRFTIME
+#endif // wxHAS_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
// used for calls to strftime() when we only deal with time
struct tm tmTimeOnly;
+ memset(&tmTimeOnly, 0, sizeof(tmTimeOnly));
tmTimeOnly.tm_hour = tm.hour;
tmTimeOnly.tm_min = tm.min;
tmTimeOnly.tm_sec = tm.sec;
- tmTimeOnly.tm_wday = 0;
- tmTimeOnly.tm_yday = 0;
- tmTimeOnly.tm_mday = 1; // any date will do
+ tmTimeOnly.tm_mday = 1; // any date will do, use 1976-01-01
tmTimeOnly.tm_mon = 0;
tmTimeOnly.tm_year = 76;
tmTimeOnly.tm_isdst = 0; // no DST, we adjust for tz ourselves
wxString tmp, res, fmt;
for ( wxString::const_iterator p = format.begin(); p != format.end(); ++p )
{
- if ( *p != _T('%') )
+ if ( *p != wxT('%') )
{
// copy as is
res += *p;
// set the default format
switch ( (*++p).GetValue() )
{
- case _T('Y'): // year has 4 digits
- fmt = _T("%04d");
+ case wxT('Y'): // year has 4 digits
+ case wxT('z'): // time zone as well
+ fmt = wxT("%04d");
break;
- case _T('j'): // day of year has 3 digits
- case _T('l'): // milliseconds have 3 digits
- fmt = _T("%03d");
+ case wxT('j'): // day of year has 3 digits
+ case wxT('l'): // milliseconds have 3 digits
+ fmt = wxT("%03d");
break;
- case _T('w'): // week day as number has only one
- fmt = _T("%d");
+ case wxT('w'): // week day as number has only one
+ fmt = wxT("%d");
break;
default:
// the format is "%02d" (for all the rest) or we have the
// field width preceding the format in which case it will
// override the default format anyhow
- fmt = _T("%02d");
+ fmt = wxT("%02d");
}
bool restart = true;
// start of the format specification
switch ( (*p).GetValue() )
{
- case _T('a'): // a weekday name
- case _T('A'):
+ case wxT('a'): // a weekday name
+ case wxT('A'):
// second parameter should be true for abbreviated names
res += GetWeekDayName(tm.GetWeekDay(),
- *p == _T('a') ? Name_Abbr : Name_Full);
+ *p == wxT('a') ? Name_Abbr : Name_Full);
break;
- case _T('b'): // a month name
- case _T('B'):
+ case wxT('b'): // a month name
+ case wxT('B'):
res += GetMonthName(tm.mon,
- *p == _T('b') ? Name_Abbr : Name_Full);
+ *p == wxT('b') ? Name_Abbr : Name_Full);
break;
- case _T('c'): // locale default date and time representation
- case _T('x'): // locale default date representation
-#ifdef HAVE_STRFTIME
+ case wxT('c'): // locale default date and time representation
+ case wxT('x'): // locale default date representation
+#ifdef wxHAS_STRFTIME
//
// the problem: there is no way to know what do these format
// specifications correspond to for the current locale.
// (indirectly) set the year correctly
while ( (nLostWeekDays % 7) != 0 )
{
- nLostWeekDays += year++ % 4 ? 1 : 2;
+ nLostWeekDays += (year++ % 4) ? 1 : 2;
}
// finally move the year below 2000 so that the 2-digit
year -= 28;
wxASSERT_MSG( year >= 1970 && year < 2000,
- _T("logic error in wxDateTime::Format") );
+ wxT("logic error in wxDateTime::Format") );
// use strftime() to format the same date but in supported
tmAdjusted.tm_mon = tm.mon;
tmAdjusted.tm_year = year - 1900;
tmAdjusted.tm_isdst = 0; // no DST, already adjusted
- wxString str = CallStrftime(*p == _T('c') ? _T("%c")
- : _T("%x"),
+ wxString str = CallStrftime(*p == wxT('c') ? wxT("%c")
+ : wxT("%x"),
&tmAdjusted);
// now replace the replacement year with the real year:
res += str;
}
-#else // !HAVE_STRFTIME
+#else // !wxHAS_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
+#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
break;
- case _T('d'): // day of a month (01-31)
+ case wxT('d'): // day of a month (01-31)
res += wxString::Format(fmt, tm.mday);
break;
- case _T('H'): // hour in 24h format (00-23)
+ case wxT('H'): // hour in 24h format (00-23)
res += wxString::Format(fmt, tm.hour);
break;
- case _T('I'): // hour in 12h format (01-12)
+ case wxT('I'): // hour in 12h format (01-12)
{
// 24h -> 12h, 0h -> 12h too
int hour12 = tm.hour > 12 ? tm.hour - 12
}
break;
- case _T('j'): // day of the year
+ case wxT('j'): // day of the year
res += wxString::Format(fmt, GetDayOfYear(tz));
break;
- case _T('l'): // milliseconds (NOT STANDARD)
+ case wxT('l'): // milliseconds (NOT STANDARD)
res += wxString::Format(fmt, GetMillisecond(tz));
break;
- case _T('m'): // month as a number (01-12)
+ case wxT('m'): // month as a number (01-12)
res += wxString::Format(fmt, tm.mon + 1);
break;
- case _T('M'): // minute as a decimal number (00-59)
+ case wxT('M'): // minute as a decimal number (00-59)
res += wxString::Format(fmt, tm.min);
break;
- case _T('p'): // AM or PM string
-#ifdef HAVE_STRFTIME
- res += CallStrftime(_T("%p"), &tmTimeOnly);
-#else // !HAVE_STRFTIME
+ case wxT('p'): // AM or PM string
+#ifdef wxHAS_STRFTIME
+ res += CallStrftime(wxT("%p"), &tmTimeOnly);
+#else // !wxHAS_STRFTIME
res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");
-#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
break;
- case _T('S'): // second as a decimal number (00-61)
+ case wxT('S'): // second as a decimal number (00-61)
res += wxString::Format(fmt, tm.sec);
break;
- case _T('U'): // week number in the year (Sunday 1st week day)
+ case wxT('U'): // week number in the year (Sunday 1st week day)
res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
break;
- case _T('W'): // week number in the year (Monday 1st week day)
+ case wxT('W'): // week number in the year (Monday 1st week day)
res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz));
break;
- case _T('w'): // weekday as a number (0-6), Sunday = 0
+ case wxT('w'): // weekday as a number (0-6), Sunday = 0
res += wxString::Format(fmt, tm.GetWeekDay());
break;
- // case _T('x'): -- handled with "%c"
+ // case wxT('x'): -- handled with "%c"
- case _T('X'): // locale default time representation
+ case wxT('X'): // locale default time representation
// just use strftime() to format the time for us
-#ifdef HAVE_STRFTIME
- res += CallStrftime(_T("%X"), &tmTimeOnly);
-#else // !HAVE_STRFTIME
+#ifdef wxHAS_STRFTIME
+ res += CallStrftime(wxT("%X"), &tmTimeOnly);
+#else // !wxHAS_STRFTIME
res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec);
-#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
break;
- case _T('y'): // year without century (00-99)
+ case wxT('y'): // year without century (00-99)
res += wxString::Format(fmt, tm.year % 100);
break;
- case _T('Y'): // year with century
+ case wxT('Y'): // year with century
res += wxString::Format(fmt, tm.year);
break;
- case _T('Z'): // timezone name
-#ifdef HAVE_STRFTIME
- res += CallStrftime(_T("%Z"), &tmTimeOnly);
+ case wxT('z'): // time zone as [-+]HHMM
+ {
+ int ofs = tz.GetOffset();
+ if ( ofs < 0 )
+ {
+ res += '-';
+ ofs = -ofs;
+ }
+ else
+ {
+ res += '+';
+ }
+
+ // Converts seconds to HHMM representation.
+ res += wxString::Format(fmt,
+ 100*(ofs/3600) + (ofs/60)%60);
+ }
+ break;
+
+ case wxT('Z'): // timezone name
+#ifdef wxHAS_STRFTIME
+ res += CallStrftime(wxT("%Z"), &tmTimeOnly);
#endif
break;
default:
// is it the format width?
- fmt.Empty();
- while ( *p == _T('-') || *p == _T('+') ||
- *p == _T(' ') || wxIsdigit(*p) )
+ for ( fmt.clear();
+ *p == wxT('-') || *p == wxT('+') ||
+ *p == wxT(' ') || wxIsdigit(*p);
+ ++p )
{
fmt += *p;
}
if ( !fmt.empty() )
{
// we've only got the flags and width so far in fmt
- fmt.Prepend(_T('%'));
- fmt.Append(_T('d'));
+ fmt.Prepend(wxT('%'));
+ fmt.Append(wxT('d'));
restart = true;
}
// no, it wasn't the width
- wxFAIL_MSG(_T("unknown format specificator"));
+ wxFAIL_MSG(wxT("unknown format specifier"));
// fall through and just copy it nevertheless
- case _T('%'): // a percent sign
+ case wxT('%'): // a percent sign
res += *p;
break;
case 0: // the end of string
- wxFAIL_MSG(_T("missing format at the end of string"));
+ wxFAIL_MSG(wxT("missing format at the end of string"));
// just put the '%' which was the last char in format
- res += _T('%');
+ res += wxT('%');
break;
}
}
return false;
// 7. now the interesting part: the timezone
- int offset wxDUMMY_INITIALIZE(0);
+ int offset = 0; // just to suppress warnings
if ( *p == '-' || *p == '+' )
{
// the explicit offset given: it has the form of hhmm
+1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, 0
};
- if ( *p < _T('A') || *p > _T('Z') || *p == _T('J') )
+ if ( *p < wxT('A') || *p > wxT('Z') || *p == wxT('J') )
return false;
offset = offsets[*p++ - 'A'];
{
// abbreviation
const wxString tz(p, date.end());
- if ( tz == _T("UT") || tz == _T("UTC") || tz == _T("GMT") )
+ if ( tz == wxT("UT") || tz == wxT("UTC") || tz == wxT("GMT") )
offset = 0;
- else if ( tz == _T("AST") )
+ else if ( tz == wxT("AST") )
offset = AST - GMT0;
- else if ( tz == _T("ADT") )
+ else if ( tz == wxT("ADT") )
offset = ADT - GMT0;
- else if ( tz == _T("EST") )
+ else if ( tz == wxT("EST") )
offset = EST - GMT0;
- else if ( tz == _T("EDT") )
+ else if ( tz == wxT("EDT") )
offset = EDT - GMT0;
- else if ( tz == _T("CST") )
+ else if ( tz == wxT("CST") )
offset = CST - GMT0;
- else if ( tz == _T("CDT") )
+ else if ( tz == wxT("CDT") )
offset = CDT - GMT0;
- else if ( tz == _T("MST") )
+ else if ( tz == wxT("MST") )
offset = MST - GMT0;
- else if ( tz == _T("MDT") )
+ else if ( tz == wxT("MDT") )
offset = MDT - GMT0;
- else if ( tz == _T("PST") )
+ else if ( tz == wxT("PST") )
offset = PST - GMT0;
- else if ( tz == _T("PDT") )
+ else if ( tz == wxT("PDT") )
offset = PDT - GMT0;
else
return false;
return true;
}
+const char* wxDateTime::ParseRfc822Date(const char* date)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseRfc822Date(dateStr, &end) )
+ return NULL;
+
+ return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t* wxDateTime::ParseRfc822Date(const wchar_t* date)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseRfc822Date(dateStr, &end) )
+ return NULL;
+
+ return date + (end - dateStr.begin());
+}
+
bool
wxDateTime::ParseFormat(const wxString& date,
const wxString& format,
bool hourIsIn12hFormat = false, // or in 24h one?
isPM = false; // AM by default
+ bool haveTimeZone = false;
+
// and the value of the items we have (init them to get rid of warnings)
wxDateTime_t msec = 0,
sec = 0,
mday = 0;
wxDateTime::Month mon = Inv_Month;
int year = 0;
+ long timeZone = 0; // time zone in seconds as expected in Tm structure
wxString::const_iterator input = date.begin();
const wxString::const_iterator end = date.end();
for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++fmt )
{
- if ( *fmt != _T('%') )
+ if ( *fmt != wxT('%') )
{
if ( wxIsspace(*fmt) )
{
{
switch ( (*fmt).GetValue() )
{
- case _T('Y'): // year has 4 digits
+ case wxT('Y'): // year has 4 digits
width = 4;
break;
- case _T('j'): // day of year has 3 digits
- case _T('l'): // milliseconds have 3 digits
+ case wxT('j'): // day of year has 3 digits
+ case wxT('l'): // milliseconds have 3 digits
width = 3;
break;
- case _T('w'): // week day as number has only one
+ case wxT('w'): // week day as number has only one
width = 1;
break;
// then the format itself
switch ( (*fmt).GetValue() )
{
- case _T('a'): // a weekday name
- case _T('A'):
+ case wxT('a'): // a weekday name
+ case wxT('A'):
{
wday = GetWeekDayFromName
(
haveWDay = true;
break;
- case _T('b'): // a month name
- case _T('B'):
+ case wxT('b'): // a month name
+ case wxT('B'):
{
mon = GetMonthFromName
(
haveMon = true;
break;
- case _T('c'): // locale default date and time representation
+ case wxT('c'): // locale default date and time representation
{
wxDateTime dt;
+#if wxUSE_INTL
const wxString
fmtDateTime = wxLocale::GetInfo(wxLOCALE_DATE_TIME_FMT);
if ( !fmtDateTime.empty() )
dt = ParseFormatAt(input, end, fmtDateTime);
-
+#endif // wxUSE_INTL
if ( !dt.IsValid() )
{
// also try the format which corresponds to ctime()
}
break;
- case _T('d'): // day of a month (01-31)
+ case wxT('d'): // day of a month (01-31)
+ case 'e': // day of a month (1-31) (GNU extension)
if ( !GetNumericToken(width, input, end, &num) ||
(num > 31) || (num < 1) )
{
mday = (wxDateTime_t)num;
break;
- case _T('H'): // hour in 24h format (00-23)
+ case wxT('H'): // hour in 24h format (00-23)
if ( !GetNumericToken(width, input, end, &num) || (num > 23) )
{
// no match
hour = (wxDateTime_t)num;
break;
- case _T('I'): // hour in 12h format (01-12)
+ case wxT('I'): // hour in 12h format (01-12)
if ( !GetNumericToken(width, input, end, &num) ||
!num || (num > 12) )
{
hour = (wxDateTime_t)(num % 12); // 12 should be 0
break;
- case _T('j'): // day of the year
+ case wxT('j'): // day of the year
if ( !GetNumericToken(width, input, end, &num) ||
!num || (num > 366) )
{
yday = (wxDateTime_t)num;
break;
- case _T('l'): // milliseconds (0-999)
+ case wxT('l'): // milliseconds (0-999)
if ( !GetNumericToken(width, input, end, &num) )
return false;
msec = (wxDateTime_t)num;
break;
- case _T('m'): // month as a number (01-12)
+ case wxT('m'): // month as a number (01-12)
if ( !GetNumericToken(width, input, end, &num) ||
!num || (num > 12) )
{
mon = (Month)(num - 1);
break;
- case _T('M'): // minute as a decimal number (00-59)
+ case wxT('M'): // minute as a decimal number (00-59)
if ( !GetNumericToken(width, input, end, &num) ||
(num > 59) )
{
min = (wxDateTime_t)num;
break;
- case _T('p'): // AM or PM string
+ case wxT('p'): // AM or PM string
{
- wxString am, pm, token = GetAlphaToken(input, end);
+ wxString am, pm;
+ GetAmPmStrings(&am, &pm);
- // some locales have empty AM/PM tokens and thus when formatting
- // dates with the %p specifier nothing is generated; when trying to
- // parse them back, we get an empty token here... but that's not
- // an error.
- if (token.empty())
- break;
+ // we can never match %p in locales which don't use AM/PM
+ if ( am.empty() || pm.empty() )
+ return false;
- GetAmPmStrings(&am, &pm);
- if (am.empty() && pm.empty())
- return false; // no am/pm strings defined
- if ( token.CmpNoCase(pm) == 0 )
+ const size_t pos = input - date.begin();
+ if ( date.compare(pos, pm.length(), pm) == 0 )
{
isPM = true;
+ input += pm.length();
}
- else if ( token.CmpNoCase(am) != 0 )
+ else if ( date.compare(pos, am.length(), am) == 0 )
+ {
+ input += am.length();
+ }
+ else // no match
{
- // no match
return false;
}
}
break;
- case _T('r'): // time as %I:%M:%S %p
+ case wxT('r'): // time as %I:%M:%S %p
{
wxDateTime dt;
if ( !dt.ParseFormat(wxString(input, end),
}
break;
- case _T('R'): // time as %H:%M
+ case wxT('R'): // time as %H:%M
{
const wxDateTime
dt = ParseFormatAt(input, end, wxS("%H:%M"));
}
break;
- case _T('S'): // second as a decimal number (00-61)
+ case wxT('S'): // second as a decimal number (00-61)
if ( !GetNumericToken(width, input, end, &num) ||
(num > 61) )
{
sec = (wxDateTime_t)num;
break;
- case _T('T'): // time as %H:%M:%S
+ case wxT('T'): // time as %H:%M:%S
{
const wxDateTime
dt = ParseFormatAt(input, end, wxS("%H:%M:%S"));
}
break;
- case _T('w'): // weekday as a number (0-6), Sunday = 0
+ case wxT('w'): // weekday as a number (0-6), Sunday = 0
if ( !GetNumericToken(width, input, end, &num) ||
(wday > 6) )
{
wday = (WeekDay)num;
break;
- case _T('x'): // locale default date representation
+ case wxT('x'): // locale default date representation
{
+#if wxUSE_INTL
wxString
fmtDate = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT),
fmtDateAlt = wxLocale::GetInfo(wxLOCALE_LONG_DATE_FMT);
-
+#else // !wxUSE_INTL
+ wxString fmtDate, fmtDateAlt;
+#endif // wxUSE_INTL/!wxUSE_INTL
if ( fmtDate.empty() )
{
if ( IsWestEuropeanCountry(GetCountry()) ||
break;
- case _T('X'): // locale default time representation
+ case wxT('X'): // locale default time representation
{
+#if wxUSE_INTL
wxString fmtTime = wxLocale::GetInfo(wxLOCALE_TIME_FMT),
fmtTimeAlt;
-
+#else // !wxUSE_INTL
+ wxString fmtTime, fmtTimeAlt;
+#endif // wxUSE_INTL/!wxUSE_INTL
if ( fmtTime.empty() )
{
// try to parse what follows as "%H:%M:%S" and, if this
}
break;
- case _T('y'): // year without century (00-99)
+ case wxT('y'): // year without century (00-99)
if ( !GetNumericToken(width, input, end, &num) ||
(num > 99) )
{
year = (num > 30 ? 1900 : 2000) + (wxDateTime_t)num;
break;
- case _T('Y'): // year with century
+ case wxT('Y'): // year with century
if ( !GetNumericToken(width, input, end, &num) )
{
// no match
year = (wxDateTime_t)num;
break;
- case _T('Z'): // timezone name
+ case wxT('z'):
+ {
+ // check that we have something here at all
+ if ( input == end )
+ return false;
+
+ // and then check that it's either plus or minus sign
+ bool minusFound;
+ if ( *input == wxT('-') )
+ minusFound = true;
+ else if ( *input == wxT('+') )
+ minusFound = false;
+ else
+ return false; // no match
+
+ // here should follow 4 digits HHMM
+ ++input;
+ unsigned long tzHourMin;
+ if ( !GetNumericToken(4, input, end, &tzHourMin) )
+ return false; // no match
+
+ const unsigned hours = tzHourMin / 100;
+ const unsigned minutes = tzHourMin % 100;
+
+ if ( hours > 12 || minutes > 59 )
+ return false; // bad format
+
+ timeZone = 3600*hours + 60*minutes;
+ if ( minusFound )
+ timeZone = -timeZone;
+
+ haveTimeZone = true;
+ }
+ break;
+
+ case wxT('Z'): // timezone name
// FIXME: currently we just ignore everything that looks like a
// time zone here
GetAlphaToken(input, end);
break;
- case _T('%'): // a percent sign
- if ( *input++ != _T('%') )
+ case wxT('%'): // a percent sign
+ if ( input == end || *input++ != wxT('%') )
{
// no match
return false;
break;
case 0: // the end of string
- wxFAIL_MSG(_T("unexpected format end"));
+ wxFAIL_MSG(wxT("unexpected format end"));
// fall through
Set(tm);
+ // If a time zone was specified and it is not the local time zone, we need
+ // to shift the time accordingly.
+ //
+ // Note that avoiding the call to MakeFromTimeZone is necessary to avoid
+ // DST problems.
+ if ( haveTimeZone && timeZone != -wxGetTimeZone() )
+ MakeFromTimezone(timeZone);
+
// finally check that the week day is consistent -- if we had it
if ( haveWDay && GetWeekDay() != wday )
return false;
return true;
}
+const char*
+wxDateTime::ParseFormat(const char* date,
+ const wxString& format,
+ const wxDateTime& dateDef)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseFormat(dateStr, format, dateDef, &end) )
+ return NULL;
+
+ return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t*
+wxDateTime::ParseFormat(const wchar_t* date,
+ const wxString& format,
+ const wxDateTime& dateDef)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseFormat(dateStr, format, dateDef, &end) )
+ return NULL;
+
+ return date + (end - dateStr.begin());
+}
+
bool
wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end)
{
wxCHECK_MSG( end, false, "end iterator pointer must be specified" );
- // 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();
+ wxDateTime
+ dtDate,
+ dtTime;
wxString::const_iterator
endTime,
return true;
}
+const char* wxDateTime::ParseDateTime(const char* date)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseDateTime(dateStr, &end) )
+ return NULL;
+
+ return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t* wxDateTime::ParseDateTime(const wchar_t* date)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseDateTime(dateStr, &end) )
+ return NULL;
+
+ return date + (end - dateStr.begin());
+}
+
bool
wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
{
const wxString::const_iterator pEnd = date.end();
wxString::const_iterator p = pBegin;
- while ( wxIsspace(*p) )
+ while ( p != pEnd && wxIsspace(*p) )
p++;
// some special cases
if ( len > lenRest )
continue;
- const wxString::const_iterator pEnd = p + len;
- if ( wxString(p, pEnd).CmpNoCase(dateStr) == 0 )
+ const wxString::const_iterator pEndStr = p + len;
+ if ( wxString(p, pEndStr).CmpNoCase(dateStr) == 0 )
{
// nothing can follow this, so stop here
- p = pEnd;
+ p = pEndStr;
int dayDiffFromToday = literalDates[n].dayDiffFromToday;
*this = Today();
*this += wxDateSpan::Days(dayDiffFromToday);
}
- *end = pEnd;
+ *end = pEndStr;
return true;
}
int year = 0;
// tokenize the string
- static const wxStringCharType *dateDelimiters = wxS(".,/-\t\r\n ");
while ( p != pEnd )
{
// skip white space and date delimiters
- while ( wxStrchr(".,/-\t\r\n ", *p) )
+ if ( wxStrchr(".,/-\t\r\n ", *p) )
{
++p;
+ continue;
}
// modify copy of the iterator as we're not sure if the next token is
else // not a valid weekday name
{
// try the ordinals
- static const char *ordinals[] =
+ static const char *const ordinals[] =
{
wxTRANSLATE("first"),
wxTRANSLATE("second"),
return true;
}
+const char* wxDateTime::ParseDate(const char* date)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseDate(dateStr, &end) )
+ return NULL;
+
+ return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t* wxDateTime::ParseDate(const wchar_t* date)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseDate(dateStr, &end) )
+ return NULL;
+
+ return date + (end - dateStr.begin());
+}
+
bool
wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end)
{
for ( size_t n = 0; n < WXSIZEOF(stdTimes); n++ )
{
const wxString timeString = wxGetTranslation(stdTimes[n].name);
- const wxString::const_iterator p = time.begin() + timeString.length();
- if ( timeString.CmpNoCase(wxString(time.begin(), p)) == 0 )
+ if ( timeString.CmpNoCase(wxString(time, timeString.length())) == 0 )
{
// casts required by DigitalMars
Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));
if ( end )
- *end = p;
+ *end = time.begin() + timeString.length();
return true;
}
// try all time formats we may think about in the order from longest to
// shortest
- static const char *timeFormats[] =
+ static const char *const timeFormats[] =
{
"%I:%M:%S %p", // 12hour with AM/PM
"%H:%M:%S", // could be the same or 24 hour one so try it too
"%I:%M %p", // 12hour with AM/PM but without seconds
- "%H:%M:%S", // and a possibly 24 hour version without seconds
+ "%H:%M", // and a possibly 24 hour version without seconds
"%X", // possibly something from above or maybe something
// completely different -- try it last
return false;
}
+const char* wxDateTime::ParseTime(const char* date)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseTime(dateStr, &end) )
+ return NULL;
+
+ return date + dateStr.IterOffsetInMBStr(end);
+}
+
+const wchar_t* wxDateTime::ParseTime(const wchar_t* date)
+{
+ wxString::const_iterator end;
+ wxString dateStr(date);
+ if ( !ParseTime(dateStr, &end) )
+ return NULL;
+
+ return date + (end - dateStr.begin());
+}
+
// ----------------------------------------------------------------------------
// Workdays and holidays support
// ----------------------------------------------------------------------------
}
wxCHECK_MSG( !format.empty(), wxEmptyString,
- _T("NULL format in wxTimeSpan::Format") );
+ wxT("NULL format in wxTimeSpan::Format") );
wxString str;
str.Alloc(format.length());
{
wxChar ch = *pch;
- if ( ch == _T('%') )
+ if ( ch == wxT('%') )
{
// the start of the format specification of the printf() below
- wxString fmtPrefix(_T('%'));
+ wxString fmtPrefix(wxT('%'));
// the number
long n;
switch ( ch )
{
default:
- wxFAIL_MSG( _T("invalid format character") );
+ wxFAIL_MSG( wxT("invalid format character") );
// fall through
- case _T('%'):
+ case wxT('%'):
str += ch;
// skip the part below switch
continue;
- case _T('D'):
+ case wxT('D'):
n = GetDays();
if ( partBiggest < Part_Day )
{
}
break;
- case _T('E'):
+ case wxT('E'):
partBiggest = Part_Week;
n = GetWeeks();
break;
- case _T('H'):
+ case wxT('H'):
n = GetHours();
if ( partBiggest < Part_Hour )
{
digits = 2;
break;
- case _T('l'):
+ case wxT('l'):
n = GetMilliseconds().ToLong();
if ( partBiggest < Part_MSec )
{
digits = 3;
break;
- case _T('M'):
+ case wxT('M'):
n = GetMinutes();
if ( partBiggest < Part_Min )
{
digits = 2;
break;
- case _T('S'):
+ case wxT('S'):
n = GetSeconds().ToLong();
if ( partBiggest < Part_Sec )
{
if ( digits )
{
- fmtPrefix << _T("0") << digits;
+ fmtPrefix << wxT("0") << digits;
}
- str += wxString::Format(fmtPrefix + _T("ld"), n);
+ str += wxString::Format(fmtPrefix + wxT("ld"), n);
}
else
{
projects / wxWidgets.git / blobdiff