///////////////////////////////////////////////////////////////////////////////
-// Name: wx/datetime.h
+// Name: src/common/datetime.cpp
// Purpose: implementation of time/date related classes
+// (for formatting&parsing see datetimefmt.cpp)
// Author: Vadim Zeitlin
// Modified by:
// Created: 11.05.99
// so long as the above copyright and this permission statement
// are retained in all copies.
//
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
/*
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "datetime.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
+
#ifndef WX_PRECOMP
+ #ifdef __WXMSW__
+ #include "wx/msw/wrapwin.h"
+ #endif
#include "wx/string.h"
- #include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/intl.h"
+ #include "wx/stopwatch.h" // for wxGetLocalTimeMillis()
+ #include "wx/module.h"
+ #include "wx/crt.h"
#endif // WX_PRECOMP
#include "wx/thread.h"
+#include "wx/time.h"
#include "wx/tokenzr.h"
-#include "wx/module.h"
-
-#define wxDEFINE_TIME_CONSTANTS // before including datetime.h
#include <ctype.h>
+#ifdef __WINDOWS__
+ #include <winnls.h>
+ #ifndef __WXWINCE__
+ #include <locale.h>
+ #endif
+#endif
+
#include "wx/datetime.h"
-#include "wx/timer.h" // for wxGetLocalTimeMillis()
// ----------------------------------------------------------------------------
-// conditional compilation
+// wxXTI
// ----------------------------------------------------------------------------
-#if defined(HAVE_STRPTIME) && defined(__LINUX__)
- // glibc 2.0.7 strptime() is broken - the following snippet causes it to
- // crash (instead of just failing):
- //
- // strncpy(buf, "Tue Dec 21 20:25:40 1999", 128);
- // strptime(buf, "%x", &tm);
- //
- // so don't use it
- #undef HAVE_STRPTIME
-#endif // broken strptime()
-
-#ifndef WX_TIMEZONE
- #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
- #define WX_TIMEZONE _timezone
- #elif defined(__MWERKS__)
- long wxmw_timezone = 28800;
- #define WX_TIMEZONE wxmw_timezone;
- #else // unknown platform - try timezone
- #define WX_TIMEZONE timezone
- #endif
-#endif // !WX_TIMEZONE
+#if wxUSE_EXTENDED_RTTI
+
+template<> void wxStringReadValue(const wxString &s , wxDateTime &data )
+{
+ data.ParseFormat(s,"%Y-%m-%d %H:%M:%S", NULL);
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxDateTime &data )
+{
+ s = data.Format("%Y-%m-%d %H:%M:%S");
+}
+
+wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringConverter<wxDateTime>)
+
+#endif // wxUSE_EXTENDED_RTTI
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
// debugging helper: just a convenient replacement of wxCHECK()
-#define wxDATETIME_CHECK(expr, msg) \
- if ( !(expr) ) \
- { \
- wxFAIL_MSG(msg); \
- *this = wxInvalidDateTime; \
- return *this; \
- }
+#define wxDATETIME_CHECK(expr, msg) \
+ wxCHECK2_MSG(expr, *this = wxInvalidDateTime; return *this, msg)
// ----------------------------------------------------------------------------
// private classes
{
wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
- return TRUE;
+ return true;
}
virtual void OnExit()
{
wxDateTimeHolidayAuthority::ClearAllAuthorities();
- wxDateTimeHolidayAuthority::ms_authorities.Clear();
+ wxDateTimeHolidayAuthority::ms_authorities.clear();
}
private:
static const int MIN_PER_HOUR = 60;
-static const int HOURS_PER_DAY = 24;
-
static const long SECONDS_PER_DAY = 86400l;
static const int DAYS_PER_WEEK = 7;
// (i.e. JDN(Jan 1, 1970) = 2440587.5)
static const long EPOCH_JDN = 2440587l;
+// these values are only used in asserts so don't define them if asserts are
+// disabled to avoid warnings about unused static variables
+#if wxDEBUG_LEVEL
// the date of JDN -0.5 (as we don't work with fractional parts, this is the
// reference date for us) is Nov 24, 4714BC
static const int JDN_0_YEAR = -4713;
static const int JDN_0_MONTH = wxDateTime::Nov;
static const int JDN_0_DAY = 24;
+#endif // wxDEBUG_LEVEL
// the constants used for JDN calculations
static const long JDN_OFFSET = 32046l;
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }
};
+const long wxDateTime::TIME_T_FACTOR = 1000l;
+
// ----------------------------------------------------------------------------
// global data
// ----------------------------------------------------------------------------
+const char wxDefaultDateTimeFormat[] = "%c";
+const char wxDefaultTimeSpanFormat[] = "%H:%M:%S";
+
// in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
// indicate an invalid wxDateTime object
-static const wxDateTime gs_dtDefault = wxLongLong((long)ULONG_MAX, ULONG_MAX);
-
-const wxDateTime& wxDefaultDateTime = gs_dtDefault;
+const wxDateTime wxDefaultDateTime;
wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
-// ----------------------------------------------------------------------------
-// private globals
-// ----------------------------------------------------------------------------
-
-// a critical section is needed to protect GetTimeZone() static
-// variable in MT case
-#if wxUSE_THREADS
- static wxCriticalSection gs_critsectTimezone;
-#endif // wxUSE_THREADS
-
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
-// debugger helper: shows what the date really is
-#ifdef __WXDEBUG__
-extern const wxChar *wxDumpDate(const wxDateTime* dt)
+// debugger helper: this function can be called from a debugger to show what
+// the date really is
+extern const char *wxDumpDate(const wxDateTime* dt)
{
- static wxChar buf[128];
+ static char buf[128];
- wxStrcpy(buf, dt->Format(_T("%Y-%m-%d (%a) %H:%M:%S")));
+ wxString fmt(dt->Format("%Y-%m-%d (%a) %H:%M:%S"));
+ wxStrlcpy(buf,
+ (fmt + " (" + dt->GetValue().ToString() + " ticks)").ToAscii(),
+ WXSIZEOF(buf));
return buf;
}
-#endif // Debug
// get the number of days in the given month of the given year
static inline
{
// the number of days in month in Julian/Gregorian calendar: the first line
// is for normal years, the second one is for the leap ones
- static wxDateTime::wxDateTime_t daysInMonth[2][MONTHS_IN_YEAR] =
+ static const wxDateTime::wxDateTime_t daysInMonth[2][MONTHS_IN_YEAR] =
{
{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
return daysInMonth[wxDateTime::IsLeapYear(year)][month];
}
-// ensure that the timezone variable is set by calling localtime
-static int GetTimeZone()
-{
- // set to TRUE when the timezone is set
- static bool s_timezoneSet = FALSE;
-
- wxCRIT_SECT_LOCKER(lock, gs_critsectTimezone);
-
- if ( !s_timezoneSet )
- {
- // just call localtime() instead of figuring out whether this system
- // supports tzset(), _tzset() or something else
- time_t t = 0;
-
- (void)localtime(&t);
- s_timezoneSet = TRUE;
- }
-
- return (int)WX_TIMEZONE;
-}
-
// return the integral part of the JDN for the midnight of the given date (to
// get the real JDN you need to add 0.5, this is, in fact, JDN of the
// noon of the previous day)
(year > JDN_0_YEAR) ||
((year == JDN_0_YEAR) && (mon > JDN_0_MONTH)) ||
((year == JDN_0_YEAR) && (mon == JDN_0_MONTH) && (day >= JDN_0_DAY)),
- _T("date out of range - can't convert to JDN")
+ wxT("date out of range - can't convert to JDN")
);
// make the year positive to avoid problems with negative numbers division
- JDN_OFFSET;
}
-// this function is a wrapper around strftime(3)
-static wxString CallStrftime(const wxChar *format, const tm* tm)
+#ifdef wxHAS_STRFTIME
+
+// this function is a wrapper around strftime(3) adding error checking
+// NOTE: not static because used by datetimefmt.cpp
+wxString CallStrftime(const wxString& format, const tm* tm)
{
wxChar buf[4096];
+ // Create temp wxString here to work around mingw/cygwin bug 1046059
+ // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435
+ wxString s;
+
if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
{
- // buffer is too small?
- wxFAIL_MSG(_T("strftime() failed"));
+ // There is one special case in which strftime() can return 0 without
+ // indicating an error: "%p" may give empty string depending on the
+ // locale, so check for it explicitly. Apparently it's really the only
+ // exception.
+ if ( format != wxS("%p") )
+ {
+ // if the format is valid, buffer must be too small?
+ wxFAIL_MSG(wxT("strftime() failed"));
+ }
+
+ buf[0] = '\0';
}
- return wxString(buf);
+ s = buf;
+ return s;
}
+#endif // wxHAS_STRFTIME
+
// if year and/or month have invalid values, replace them with the current ones
static void ReplaceDefaultYearMonthWithCurrent(int *year,
wxDateTime::Month *month)
{
struct tm *tmNow = NULL;
+ struct tm tmstruct;
if ( *year == wxDateTime::Inv_Year )
{
- tmNow = wxDateTime::GetTmNow();
+ tmNow = wxDateTime::GetTmNow(&tmstruct);
*year = 1900 + tmNow->tm_year;
}
if ( *month == wxDateTime::Inv_Month )
{
if ( !tmNow )
- tmNow = wxDateTime::GetTmNow();
+ tmNow = wxDateTime::GetTmNow(&tmstruct);
*month = (wxDateTime::Month)tmNow->tm_mon;
}
}
-// fll the struct tm with default values
-static void InitTm(struct tm& tm)
+// fill the struct tm with default values
+// NOTE: not static because used by datetimefmt.cpp
+void InitTm(struct tm& tm)
{
// struct tm may have etxra fields (undocumented and with unportable
// names) which, nevertheless, must be set to 0
tm.tm_isdst = -1; // auto determine
}
-// parsing helpers
-// ---------------
-
-// return the month if the string is a month name or Inv_Month otherwise
-static wxDateTime::Month GetMonthFromName(const wxString& name, int flags)
-{
- wxDateTime::Month mon;
- for ( mon = wxDateTime::Jan; mon < wxDateTime::Inv_Month; wxNextMonth(mon) )
- {
- // case-insensitive comparison either one of or with both abbreviated
- // and not versions
- if ( flags & wxDateTime::Name_Full )
- {
- if ( name.CmpNoCase(wxDateTime::
- GetMonthName(mon, wxDateTime::Name_Full)) == 0 )
- {
- break;
- }
- }
-
- if ( flags & wxDateTime::Name_Abbr )
- {
- if ( name.CmpNoCase(wxDateTime::
- GetMonthName(mon, wxDateTime::Name_Abbr)) == 0 )
- {
- break;
- }
- }
- }
-
- return mon;
-}
-
-// return the weekday if the string is a weekday name or Inv_WeekDay otherwise
-static wxDateTime::WeekDay GetWeekDayFromName(const wxString& name, int flags)
-{
- wxDateTime::WeekDay wd;
- for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
- {
- // case-insensitive comparison either one of or with both abbreviated
- // and not versions
- if ( flags & wxDateTime::Name_Full )
- {
- if ( name.CmpNoCase(wxDateTime::
- GetWeekDayName(wd, wxDateTime::Name_Full)) == 0 )
- {
- break;
- }
- }
-
- if ( flags & wxDateTime::Name_Abbr )
- {
- if ( name.CmpNoCase(wxDateTime::
- GetWeekDayName(wd, wxDateTime::Name_Abbr)) == 0 )
- {
- break;
- }
- }
- }
-
- return wd;
-}
-
-// 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)
-{
- size_t n = 1;
- wxString s;
- while ( wxIsdigit(*p) )
- {
- s += *p++;
-
- if ( len && ++n > len )
- break;
- }
-
- return !!s && s.ToULong(number);
-}
-
-// scans all alphabetic characters and returns the resulting string
-static wxString GetAlphaToken(const wxChar*& p)
-{
- wxString s;
- while ( wxIsalpha(*p) )
- {
- s += *p++;
- }
-
- return s;
-}
-
// ============================================================================
// implementation of wxDateTime
// ============================================================================
{
year = (wxDateTime_t)wxDateTime::Inv_Year;
mon = wxDateTime::Inv_Month;
- mday = 0;
- hour = min = sec = msec = 0;
+ mday =
+ yday = 0;
+ hour =
+ min =
+ sec =
+ msec = 0;
wday = wxDateTime::Inv_WeekDay;
}
: m_tz(tz)
{
msec = 0;
- sec = tm.tm_sec;
- min = tm.tm_min;
- hour = tm.tm_hour;
- mday = tm.tm_mday;
+ sec = (wxDateTime::wxDateTime_t)tm.tm_sec;
+ min = (wxDateTime::wxDateTime_t)tm.tm_min;
+ hour = (wxDateTime::wxDateTime_t)tm.tm_hour;
+ mday = (wxDateTime::wxDateTime_t)tm.tm_mday;
mon = (wxDateTime::Month)tm.tm_mon;
year = 1900 + tm.tm_year;
- wday = tm.tm_wday;
- yday = tm.tm_yday;
+ wday = (wxDateTime::wxDateTime_t)tm.tm_wday;
+ yday = (wxDateTime::wxDateTime_t)tm.tm_yday;
}
bool wxDateTime::Tm::IsValid() const
{
+ if ( mon == wxDateTime::Inv_Month )
+ return false;
+
+ // We need to check this here to avoid crashing in GetNumOfDaysInMonth() if
+ // somebody passed us "(wxDateTime::Month)1000".
+ wxCHECK_MSG( mon >= wxDateTime::Jan && mon < wxDateTime::Inv_Month, false,
+ wxS("Invalid month value") );
+
// we allow for the leap seconds, although we don't use them (yet)
return (year != wxDateTime::Inv_Year) && (mon != wxDateTime::Inv_Month) &&
- (mday <= GetNumOfDaysInMonth(year, mon)) &&
+ (mday > 0 && mday <= GetNumOfDaysInMonth(year, mon)) &&
(hour < 24) && (min < 60) && (sec < 62) && (msec < 1000);
}
// compute the week day from day/month/year: we use the dumbest algorithm
// possible: just compute our JDN and then use the (simple to derive)
// formula: weekday = (JDN + 1.5) % 7
- wday = (wxDateTime::WeekDay)(GetTruncatedJDN(mday, mon, year) + 2) % 7;
+ wday = (wxDateTime::wxDateTime_t)((GetTruncatedJDN(mday, mon, year) + 2) % 7);
}
void wxDateTime::Tm::AddMonths(int monDiff)
mon = (wxDateTime::Month)(mon + monDiff);
- wxASSERT_MSG( mon >= 0 && mon < MONTHS_IN_YEAR, _T("logic error") );
+ wxASSERT_MSG( mon >= 0 && mon < MONTHS_IN_YEAR, wxT("logic error") );
// NB: we don't check here that the resulting date is valid, this function
// is private and the caller must check it if needed
dayDiff += GetNumOfDaysInMonth(year, mon);
}
- mday += dayDiff;
+ mday = (wxDateTime::wxDateTime_t)( mday + dayDiff );
while ( mday > GetNumOfDaysInMonth(year, mon) )
{
mday -= GetNumOfDaysInMonth(year, mon);
}
wxASSERT_MSG( mday > 0 && mday <= GetNumOfDaysInMonth(year, mon),
- _T("logic error") );
+ wxT("logic error") );
}
// ----------------------------------------------------------------------------
case wxDateTime::Local:
// get the offset from C RTL: it returns the difference GMT-local
// while we want to have the offset _from_ GMT, hence the '-'
- m_offset = -GetTimeZone();
+ m_offset = -wxGetTimeZone();
break;
case wxDateTime::GMT_12:
case wxDateTime::GMT10:
case wxDateTime::GMT11:
case wxDateTime::GMT12:
+ case wxDateTime::GMT13:
m_offset = 3600*(tz - wxDateTime::GMT0);
break;
case wxDateTime::A_CST:
// Central Standard Time in use in Australia = UTC + 9.5
- m_offset = 60l*(9*60 + 30);
+ m_offset = 60l*(9*MIN_PER_HOUR + MIN_PER_HOUR/2);
break;
default:
- wxFAIL_MSG( _T("unknown time zone") );
+ wxFAIL_MSG( wxT("unknown time zone") );
}
}
// static functions
// ----------------------------------------------------------------------------
+/* static */
+struct tm *wxDateTime::GetTmNow(struct tm *tmstruct)
+{
+ time_t t = GetTimeNow();
+ return wxLocaltime_r(&t, tmstruct);
+}
+
/* static */
bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal)
{
}
else
{
- wxFAIL_MSG(_T("unknown calendar"));
+ wxFAIL_MSG(wxT("unknown calendar"));
- return FALSE;
+ return false;
}
}
return Now().GetYear();
case Julian:
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
break;
default:
- wxFAIL_MSG(_T("unsupported calendar"));
+ wxFAIL_MSG(wxT("unsupported calendar"));
break;
}
return Now().GetMonth();
case Julian:
- wxFAIL_MSG(_T("TODO"));
+ wxFAIL_MSG(wxT("TODO"));
break;
default:
- wxFAIL_MSG(_T("unsupported calendar"));
+ wxFAIL_MSG(wxT("unsupported calendar"));
break;
}
return IsLeapYear(year) ? 366 : 365;
default:
- wxFAIL_MSG(_T("unsupported calendar"));
+ wxFAIL_MSG(wxT("unsupported calendar"));
break;
}
int year,
wxDateTime::Calendar cal)
{
- wxCHECK_MSG( month < MONTHS_IN_YEAR, 0, _T("invalid month") );
+ wxCHECK_MSG( month < MONTHS_IN_YEAR, 0, wxT("invalid month") );
if ( cal == Gregorian || cal == Julian )
{
}
else
{
- wxFAIL_MSG(_T("unsupported calendar"));
+ wxFAIL_MSG(wxT("unsupported calendar"));
return 0;
}
}
+namespace
+{
+
+// helper function used by GetEnglish/WeekDayName(): returns 0 if flags is
+// Name_Full and 1 if it is Name_Abbr or -1 if the flags is incorrect (and
+// asserts in this case)
+//
+// the return value of this function is used as an index into 2D array
+// containing full names in its first row and abbreviated ones in the 2nd one
+int NameArrayIndexFromFlag(wxDateTime::NameFlags flags)
+{
+ switch ( flags )
+ {
+ case wxDateTime::Name_Full:
+ return 0;
+
+ case wxDateTime::Name_Abbr:
+ return 1;
+
+ default:
+ wxFAIL_MSG( "unknown wxDateTime::NameFlags value" );
+ }
+
+ return -1;
+}
+
+} // anonymous namespace
+
+/* static */
+wxString wxDateTime::GetEnglishMonthName(Month month, NameFlags flags)
+{
+ wxCHECK_MSG( month != Inv_Month, wxEmptyString, "invalid month" );
+
+ static const char *const monthNames[2][MONTHS_IN_YEAR] =
+ {
+ { "January", "February", "March", "April", "May", "June",
+ "July", "August", "September", "October", "November", "December" },
+ { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }
+ };
+
+ const int idx = NameArrayIndexFromFlag(flags);
+ if ( idx == -1 )
+ return wxString();
+
+ return monthNames[idx][month];
+}
+
/* static */
wxString wxDateTime::GetMonthName(wxDateTime::Month month,
wxDateTime::NameFlags flags)
{
- wxCHECK_MSG( month != Inv_Month, _T(""), _T("invalid month") );
+#ifdef wxHAS_STRFTIME
+ wxCHECK_MSG( month != Inv_Month, wxEmptyString, wxT("invalid month") );
// 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)
InitTm(tm);
tm.tm_mon = month;
- return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &tm);
+ return CallStrftime(flags == Name_Abbr ? wxT("%b") : wxT("%B"), &tm);
+#else // !wxHAS_STRFTIME
+ return GetEnglishMonthName(month, flags);
+#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
+}
+
+/* static */
+wxString wxDateTime::GetEnglishWeekDayName(WeekDay wday, NameFlags flags)
+{
+ wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, wxT("invalid weekday") );
+
+ static const char *const weekdayNames[2][DAYS_PER_WEEK] =
+ {
+ { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
+ "Saturday" },
+ { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" },
+ };
+
+ const int idx = NameArrayIndexFromFlag(flags);
+ if ( idx == -1 )
+ return wxString();
+
+ return weekdayNames[idx][wday];
}
/* static */
wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
wxDateTime::NameFlags flags)
{
- wxCHECK_MSG( wday != Inv_WeekDay, _T(""), _T("invalid weekday") );
+#ifdef wxHAS_STRFTIME
+ wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, wxT("invalid weekday") );
- // take some arbitrary Sunday
+ // take some arbitrary Sunday (but notice that the day should be such that
+ // after adding wday to it below we still have a valid date, e.g. don't
+ // take 28 here!)
tm tm;
InitTm(tm);
- tm.tm_mday = 28;
+ tm.tm_mday = 21;
tm.tm_mon = Nov;
tm.tm_year = 99;
(void)mktime(&tm);
// ... and call strftime()
- return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm);
+ return CallStrftime(flags == Name_Abbr ? wxT("%a") : wxT("%A"), &tm);
+#else // !wxHAS_STRFTIME
+ return GetEnglishWeekDayName(wday, flags);
+#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
}
/* static */
{
tm tm;
InitTm(tm);
+ wxChar buffer[64];
+ // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
+ // and causes an assertion failed if the buffer is to small (which is good) - OR -
+ // if strftime does not return anything because the format string is invalid - OR -
+ // if there are no 'am' / 'pm' tokens defined for the current locale (which is not good).
+ // wxDateTime::ParseTime will try several different formats to parse the time.
+ // As a result, GetAmPmStrings might get called, even if the current locale
+ // does not define any 'am' / 'pm' tokens. In this case, wxStrftime would
+ // assert, even though it is a perfectly legal use.
if ( am )
{
- *am = CallStrftime(_T("%p"), &tm);
+ if (wxStrftime(buffer, WXSIZEOF(buffer), wxT("%p"), &tm) > 0)
+ *am = wxString(buffer);
+ else
+ *am = wxString();
}
if ( pm )
{
tm.tm_hour = 13;
- *pm = CallStrftime(_T("%p"), &tm);
+ if (wxStrftime(buffer, WXSIZEOF(buffer), wxT("%p"), &tm) > 0)
+ *pm = wxString(buffer);
+ else
+ *pm = wxString();
}
}
+
// ----------------------------------------------------------------------------
// Country stuff: date calculations depend on the country (DST, work days,
// ...), so we need to know which rules to follow.
wxDateTime::Country wxDateTime::GetCountry()
{
// TODO use LOCALE_ICOUNTRY setting under Win32
-
+#ifndef __WXWINCE__
if ( ms_country == Country_Unknown )
{
// try to guess from the time zone name
time_t t = time(NULL);
- struct tm *tm = localtime(&t);
+ struct tm tmstruct;
+ struct tm *tm = wxLocaltime_r(&t, &tmstruct);
- wxString tz = CallStrftime(_T("%Z"), tm);
- if ( tz == _T("WET") || tz == _T("WEST") )
+ wxString tz = CallStrftime(wxT("%Z"), tm);
+ if ( tz == wxT("WET") || tz == wxT("WEST") )
{
ms_country = UK;
}
- else if ( tz == _T("CET") || tz == _T("CEST") )
+ else if ( tz == wxT("CET") || tz == wxT("CEST") )
{
ms_country = Country_EEC;
}
- else if ( tz == _T("MSK") || tz == _T("MSD") )
+ else if ( tz == wxT("MSK") || tz == wxT("MSD") )
{
ms_country = Russia;
}
- else if ( tz == _T("AST") || tz == _T("ADT") ||
- tz == _T("EST") || tz == _T("EDT") ||
- tz == _T("CST") || tz == _T("CDT") ||
- tz == _T("MST") || tz == _T("MDT") ||
- tz == _T("PST") || tz == _T("PDT") )
+ else if ( tz == wxT("AST") || tz == wxT("ADT") ||
+ tz == wxT("EST") || tz == wxT("EDT") ||
+ tz == wxT("CST") || tz == wxT("CDT") ||
+ tz == wxT("MST") || tz == wxT("MDT") ||
+ tz == wxT("PST") || tz == wxT("PDT") )
{
ms_country = USA;
}
ms_country = USA;
}
}
+#else // __WXWINCE__
+ ms_country = USA;
+#endif // !__WXWINCE__/__WXWINCE__
return ms_country;
}
if ( !dt.SetToLastWeekDay(Sun, Mar, year) )
{
// weird...
- wxFAIL_MSG( _T("no last Sunday in March?") );
+ wxFAIL_MSG( wxT("no last Sunday in March?") );
}
dt += wxTimeSpan::Hours(1);
-
- // disable DST tests because it could result in an infinite recursion!
- dt.MakeGMT(TRUE);
}
else switch ( country )
{
if ( !dt.SetToLastWeekDay(Sun, Apr, year) )
{
// weird...
- wxFAIL_MSG( _T("no first Sunday in April?") );
+ wxFAIL_MSG( wxT("no first Sunday in April?") );
+ }
+ }
+ else if ( year > 2006 )
+ // Energy Policy Act of 2005, Pub. L. no. 109-58, 119 Stat 594 (2005).
+ // Starting in 2007, daylight time begins in the United States on the
+ // second Sunday in March and ends on the first Sunday in November
+ {
+ if ( !dt.SetToWeekDay(Sun, 2, Mar, year) )
+ {
+ // weird...
+ wxFAIL_MSG( wxT("no second Sunday in March?") );
}
}
else
if ( !dt.SetToWeekDay(Sun, 1, Apr, year) )
{
// weird...
- wxFAIL_MSG( _T("no first Sunday in April?") );
+ wxFAIL_MSG( wxT("no first Sunday in April?") );
}
}
if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
{
// weirder and weirder...
- wxFAIL_MSG( _T("no last Sunday in October?") );
+ wxFAIL_MSG( wxT("no last Sunday in October?") );
}
dt += wxTimeSpan::Hours(1);
-
- // disable DST tests because it could result in an infinite recursion!
- dt.MakeGMT(TRUE);
}
else switch ( country )
{
dt.Set(30, Sep, year);
break;
- default:
- // DST ends at 2 a.m. on the last Sunday of October
- if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
+ default: // default for switch (year)
+ if ( year > 2006 )
+ // Energy Policy Act of 2005, Pub. L. no. 109-58, 119 Stat 594 (2005).
+ // Starting in 2007, daylight time begins in the United States on the
+ // second Sunday in March and ends on the first Sunday in November
+ {
+ if ( !dt.SetToWeekDay(Sun, 1, Nov, year) )
+ {
+ // weird...
+ wxFAIL_MSG( wxT("no first Sunday in November?") );
+ }
+ }
+ else
+ // pre-2007
+ // DST ends at 2 a.m. on the last Sunday of October
{
- // weirder and weirder...
- wxFAIL_MSG( _T("no last Sunday in October?") );
+ if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
+ {
+ // weirder and weirder...
+ wxFAIL_MSG( wxT("no last Sunday in October?") );
+ }
}
dt += wxTimeSpan::Hours(2);
- // TODO what about timezone??
+ // TODO: what about timezone??
}
break;
- default:
+ default: // default for switch (country)
// assume October 26th as the end of the DST - totally bogus too
dt.Set(26, Oct, year);
}
// return the current time with ms precision
/* static */ wxDateTime wxDateTime::UNow()
{
- return wxDateTime(wxGetLocalTimeMillis());
+ return wxDateTime(wxGetUTCTimeMillis());
}
// the values in the tm structure contain the local time
wxDateTime& wxDateTime::Set(const struct tm& tm)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-
struct tm tm2(tm);
time_t timet = mktime(&tm2);
// less than timezone - try to make it work for this case
if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
{
- // add timezone to make sure that date is in range
- tm2.tm_sec -= GetTimeZone();
-
- timet = mktime(&tm2);
- if ( timet != (time_t)-1 )
- {
- timet += GetTimeZone();
-
- return Set(timet);
- }
+ return Set((time_t)(
+ wxGetTimeZone() +
+ tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
+ tm2.tm_min * SEC_PER_MIN +
+ tm2.tm_sec));
}
- wxFAIL_MSG( _T("mktime() failed") );
+ wxFAIL_MSG( wxT("mktime() failed") );
*this = wxInvalidDateTime;
wxDateTime_t second,
wxDateTime_t millisec)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-
// we allow seconds to be 61 to account for the leap seconds, even if we
// don't use them really
wxDATETIME_CHECK( hour < 24 &&
second < 62 &&
minute < 60 &&
millisec < 1000,
- _T("Invalid time in wxDateTime::Set()") );
+ wxT("Invalid time in wxDateTime::Set()") );
// get the current date from system
- struct tm *tm = GetTmNow();
+ struct tm tmstruct;
+ struct tm *tm = GetTmNow(&tmstruct);
+
+ wxDATETIME_CHECK( tm, wxT("wxLocaltime_r() failed") );
- wxDATETIME_CHECK( tm, _T("localtime() failed") );
+ // make a copy so it isn't clobbered by the call to mktime() below
+ struct tm tm1(*tm);
// adjust the time
- tm->tm_hour = hour;
- tm->tm_min = minute;
- tm->tm_sec = second;
+ tm1.tm_hour = hour;
+ tm1.tm_min = minute;
+ tm1.tm_sec = second;
- (void)Set(*tm);
+ // and the DST in case it changes on this date
+ struct tm tm2(tm1);
+ mktime(&tm2);
+ if ( tm2.tm_isdst != tm1.tm_isdst )
+ tm1.tm_isdst = tm2.tm_isdst;
+
+ (void)Set(tm1);
// and finally adjust milliseconds
return SetMillisecond(millisec);
wxDateTime_t second,
wxDateTime_t millisec)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-
wxDATETIME_CHECK( hour < 24 &&
second < 62 &&
minute < 60 &&
millisec < 1000,
- _T("Invalid time in wxDateTime::Set()") );
+ wxT("Invalid time in wxDateTime::Set()") );
ReplaceDefaultYearMonthWithCurrent(&year, &month);
wxDATETIME_CHECK( (0 < day) && (day <= GetNumberOfDays(month, year)),
- _T("Invalid date in wxDateTime::Set()") );
+ wxT("Invalid date in wxDateTime::Set()") );
// the range of time_t type (inclusive)
static const int yearMinInRange = 1970;
(void)Set(tm);
// and finally adjust milliseconds
- return SetMillisecond(millisec);
+ if (IsValid())
+ SetMillisecond(millisec);
+
+ return *this;
}
else
{
m_time *= SECONDS_PER_DAY * TIME_T_FACTOR;
// JDN corresponds to GMT, we take localtime
- Add(wxTimeSpan(hour, minute, second + GetTimeZone(), millisec));
+ Add(wxTimeSpan(hour, minute, second + wxGetTimeZone(), millisec));
}
return *this;
// EPOCH_JDN + 0.5
jdn -= EPOCH_JDN + 0.5;
- jdn *= MILLISECONDS_PER_DAY;
+ m_time.Assign(jdn*MILLISECONDS_PER_DAY);
- m_time.Assign(jdn);
+ // JDNs always are in UTC, so we don't need any adjustments for time zone
return *this;
}
return *this;
}
+wxDateTime wxDateTime::GetDateOnly() const
+{
+ Tm tm = GetTm();
+ tm.msec =
+ tm.sec =
+ tm.min =
+ tm.hour = 0;
+ return wxDateTime(tm);
+}
+
+// ----------------------------------------------------------------------------
+// DOS Date and Time Format functions
+// ----------------------------------------------------------------------------
+// the dos date and time value is an unsigned 32 bit value in the format:
+// YYYYYYYMMMMDDDDDhhhhhmmmmmmsssss
+//
+// Y = year offset from 1980 (0-127)
+// M = month (1-12)
+// D = day of month (1-31)
+// h = hour (0-23)
+// m = minute (0-59)
+// s = bisecond (0-29) each bisecond indicates two seconds
+// ----------------------------------------------------------------------------
+
+wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
+{
+ struct tm tm;
+ InitTm(tm);
+
+ long year = ddt & 0xFE000000;
+ year >>= 25;
+ year += 80;
+ tm.tm_year = year;
+
+ long month = ddt & 0x1E00000;
+ month >>= 21;
+ month -= 1;
+ tm.tm_mon = month;
+
+ long day = ddt & 0x1F0000;
+ day >>= 16;
+ tm.tm_mday = day;
+
+ long hour = ddt & 0xF800;
+ hour >>= 11;
+ tm.tm_hour = hour;
+
+ long minute = ddt & 0x7E0;
+ minute >>= 5;
+ tm.tm_min = minute;
+
+ long second = ddt & 0x1F;
+ tm.tm_sec = second * 2;
+
+ return Set(mktime(&tm));
+}
+
+unsigned long wxDateTime::GetAsDOS() const
+{
+ unsigned long ddt;
+ time_t ticks = GetTicks();
+ struct tm tmstruct;
+ struct tm *tm = wxLocaltime_r(&ticks, &tmstruct);
+ wxCHECK_MSG( tm, ULONG_MAX, wxT("time can't be represented in DOS format") );
+
+ long year = tm->tm_year;
+ year -= 80;
+ year <<= 25;
+
+ long month = tm->tm_mon;
+ month += 1;
+ month <<= 21;
+
+ long day = tm->tm_mday;
+ day <<= 16;
+
+ long hour = tm->tm_hour;
+ hour <<= 11;
+
+ long minute = tm->tm_min;
+ minute <<= 5;
+
+ long second = tm->tm_sec;
+ second /= 2;
+
+ ddt = year | month | day | hour | minute | second;
+ return ddt;
+}
+
// ----------------------------------------------------------------------------
// time_t <-> broken down time conversions
// ----------------------------------------------------------------------------
wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
time_t time = GetTicks();
if ( time != (time_t)-1 )
{
// use C RTL functions
+ struct tm tmstruct;
tm *tm;
- if ( tz.GetOffset() == -GetTimeZone() )
+ if ( tz.GetOffset() == -wxGetTimeZone() )
{
// we are working with local time
- tm = localtime(&time);
+ tm = wxLocaltime_r(&time, &tmstruct);
// should never happen
- wxCHECK_MSG( tm, Tm(), _T("localtime() failed") );
+ wxCHECK_MSG( tm, Tm(), wxT("wxLocaltime_r() failed") );
}
else
{
if ( time >= 0 )
#endif
{
- tm = gmtime(&time);
+ tm = wxGmtime_r(&time, &tmstruct);
// should never happen
- wxCHECK_MSG( tm, Tm(), _T("gmtime() failed") );
+ wxCHECK_MSG( tm, Tm(), wxT("wxGmtime_r() failed") );
}
else
{
// CREDIT: code below is by Scott E. Lee (but bugs are mine)
- wxASSERT_MSG( jdn > -2, _T("JDN out of range") );
+ wxASSERT_MSG( jdn > -2, wxT("JDN out of range") );
// calculate the century
long temp = (jdn + JDN_OFFSET) * 4 - 1;
year -= 4800;
// check that the algorithm gave us something reasonable
- wxASSERT_MSG( (0 < month) && (month <= 12), _T("invalid month") );
- wxASSERT_MSG( (1 <= day) && (day < 32), _T("invalid day") );
- wxASSERT_MSG( (INT_MIN <= year) && (year <= INT_MAX),
- _T("year range overflow") );
+ wxASSERT_MSG( (0 < month) && (month <= 12), wxT("invalid month") );
+ wxASSERT_MSG( (1 <= day) && (day < 32), wxT("invalid day") );
// construct Tm from these values
Tm tm;
tm.year = (int)year;
+ tm.yday = (wxDateTime_t)(dayOfYear - 1); // use C convention for day number
tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0
tm.mday = (wxDateTime_t)day;
tm.msec = (wxDateTime_t)(timeOnly % 1000);
timeOnly -= tm.msec;
timeOnly /= 1000; // now we have time in seconds
- tm.sec = (wxDateTime_t)(timeOnly % 60);
+ tm.sec = (wxDateTime_t)(timeOnly % SEC_PER_MIN);
timeOnly -= tm.sec;
- timeOnly /= 60; // now we have time in minutes
+ timeOnly /= SEC_PER_MIN; // now we have time in minutes
- tm.min = (wxDateTime_t)(timeOnly % 60);
+ tm.min = (wxDateTime_t)(timeOnly % MIN_PER_HOUR);
timeOnly -= tm.min;
- tm.hour = (wxDateTime_t)(timeOnly / 60);
+ tm.hour = (wxDateTime_t)(timeOnly / MIN_PER_HOUR);
return tm;
}
wxDateTime& wxDateTime::SetYear(int year)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
Tm tm(GetTm());
tm.year = year;
wxDateTime& wxDateTime::SetMonth(Month month)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
Tm tm(GetTm());
tm.mon = month;
wxDateTime& wxDateTime::SetDay(wxDateTime_t mday)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
Tm tm(GetTm());
tm.mday = mday;
wxDateTime& wxDateTime::SetHour(wxDateTime_t hour)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
Tm tm(GetTm());
tm.hour = hour;
wxDateTime& wxDateTime::SetMinute(wxDateTime_t min)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
Tm tm(GetTm());
tm.min = min;
wxDateTime& wxDateTime::SetSecond(wxDateTime_t sec)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
Tm tm(GetTm());
tm.sec = sec;
wxDateTime& wxDateTime::SetMillisecond(wxDateTime_t millisecond)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+ wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
// we don't need to use GetTm() for this one
m_time -= m_time % 1000l;
Set(tm);
wxASSERT_MSG( IsSameTime(tm),
- _T("Add(wxDateSpan) shouldn't modify time") );
+ wxT("Add(wxDateSpan) shouldn't modify time") );
return *this;
}
// Weekday and monthday stuff
// ----------------------------------------------------------------------------
-bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek, WeekDay weekday)
+// convert Sun, Mon, ..., Sat into 6, 0, ..., 5
+static inline int ConvertWeekDayToMondayBase(int wd)
{
- int year = GetYear();
+ return wd == wxDateTime::Sun ? 6 : wd - 1;
+}
+
+/* static */
+wxDateTime
+wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd)
+{
+ wxASSERT_MSG( numWeek > 0,
+ wxT("invalid week number: weeks are counted from 1") );
// Jan 4 always lies in the 1st week of the year
- Set(4, Jan, year);
- SetToWeekDayInSameWeek(weekday) += wxDateSpan::Weeks(numWeek);
+ wxDateTime dt(4, Jan, year);
+ dt.SetToWeekDayInSameWeek(wd);
+ dt += wxDateSpan::Weeks(numWeek - 1);
+
+ return dt;
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+// use a separate function to avoid warnings about using deprecated
+// SetToTheWeek in GetWeek below
+static wxDateTime
+SetToTheWeek(int year,
+ wxDateTime::wxDateTime_t numWeek,
+ wxDateTime::WeekDay weekday,
+ wxDateTime::WeekFlags flags)
+{
+ // Jan 4 always lies in the 1st week of the year
+ wxDateTime dt(4, wxDateTime::Jan, year);
+ dt.SetToWeekDayInSameWeek(weekday, flags);
+ dt += wxDateSpan::Weeks(numWeek - 1);
+
+ return dt;
+}
+bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
+ WeekDay weekday,
+ WeekFlags flags)
+{
+ int year = GetYear();
+ *this = ::SetToTheWeek(year, numWeek, weekday, flags);
if ( GetYear() != year )
{
// oops... numWeek was too big
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
+}
+
+wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,
+ WeekDay weekday,
+ WeekFlags flags) const
+{
+ return ::SetToTheWeek(GetYear(), numWeek, weekday, flags);
}
+#endif // WXWIN_COMPATIBILITY_2_6
wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
int year)
return Set(GetNumOfDaysInMonth(year, month), month, year);
}
-wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday)
+wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)
{
- wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+ wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") );
- WeekDay wdayThis = GetWeekDay();
- if ( weekday == wdayThis )
+ int wdayDst = weekday,
+ wdayThis = GetWeekDay();
+ if ( wdayDst == wdayThis )
{
// nothing to do
return *this;
}
- else if ( weekday < wdayThis )
+
+ if ( flags == Default_First )
+ {
+ flags = GetCountry() == USA ? Sunday_First : Monday_First;
+ }
+
+ // the logic below based on comparing weekday and wdayThis works if Sun (0)
+ // is the first day in the week, but breaks down for Monday_First case so
+ // we adjust the week days in this case
+ if ( flags == Monday_First )
+ {
+ if ( wdayThis == Sun )
+ wdayThis += 7;
+ if ( wdayDst == Sun )
+ wdayDst += 7;
+ }
+ //else: Sunday_First, nothing to do
+
+ // go forward or back in time to the day we want
+ if ( wdayDst < wdayThis )
{
- return Subtract(wxDateSpan::Days(wdayThis - weekday));
+ return Subtract(wxDateSpan::Days(wdayThis - wdayDst));
}
else // weekday > wdayThis
{
- return Add(wxDateSpan::Days(weekday - wdayThis));
+ return Add(wxDateSpan::Days(wdayDst - wdayThis));
}
}
wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
{
- wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+ wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") );
int diff;
WeekDay wdayThis = GetWeekDay();
wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
{
- wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+ wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") );
int diff;
WeekDay wdayThis = GetWeekDay();
Month month,
int year)
{
- wxCHECK_MSG( weekday != Inv_WeekDay, FALSE, _T("invalid weekday") );
+ wxCHECK_MSG( weekday != Inv_WeekDay, false, wxT("invalid weekday") );
- // we don't check explicitly that -5 <= n <= 5 because we will return FALSE
+ // we don't check explicitly that -5 <= n <= 5 because we will return false
// anyhow in such case - but may be should still give an assert for it?
// take the current month/year if none specified
{
*this = dt;
- return TRUE;
+ return true;
}
else
{
// no such day in this month
- return FALSE;
+ return false;
}
}
-wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
+static inline
+wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm)
{
- Tm tm(GetTm(tz));
+ return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday);
+}
- return gs_cumulatedDays[IsLeapYear(tm.year)][tm.mon] + tm.mday;
+wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
+{
+ return GetDayOfYearFromTm(GetTm(tz));
}
-wxDateTime::wxDateTime_t wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags,
- const TimeZone& tz) const
+wxDateTime::wxDateTime_t
+wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const
{
if ( flags == Default_First )
{
flags = GetCountry() == USA ? Sunday_First : Monday_First;
}
- wxDateTime_t nDayInYear = GetDayOfYear(tz);
- wxDateTime_t week;
+ Tm tm(GetTm(tz));
+ wxDateTime_t nDayInYear = GetDayOfYearFromTm(tm);
- WeekDay wd = GetWeekDay(tz);
+ int wdTarget = GetWeekDay(tz);
+ int wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
+ int week;
if ( flags == Sunday_First )
{
- week = (nDayInYear - wd + 7) / 7;
+ // FIXME: First week is not calculated correctly.
+ week = (nDayInYear - wdTarget + 7) / 7;
+ if ( wdYearStart == Wed || wdYearStart == Thu )
+ week++;
}
- else
+ else // week starts with monday
{
- // have to shift the week days values
- week = (nDayInYear - (wd - 1 + 7) % 7 + 7) / 7;
- }
+ // adjust the weekdays to non-US style.
+ wdYearStart = ConvertWeekDayToMondayBase(wdYearStart);
+ wdTarget = ConvertWeekDayToMondayBase(wdTarget);
- // FIXME some more elegant way??
- WeekDay wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
- if ( wdYearStart == Wed || wdYearStart == Thu )
- {
- week++;
+ // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html:
+ //
+ // Week 01 of a year is per definition the first week that has the
+ // Thursday in this year, which is equivalent to the week that
+ // contains the fourth day of January. In other words, the first
+ // week of a new year is the week that has the majority of its
+ // days in the new year. Week 01 might also contain days from the
+ // previous year and the week before week 01 of a year is the last
+ // week (52 or 53) of the previous year even if it contains days
+ // from the new year. A week starts with Monday (day 1) and ends
+ // with Sunday (day 7).
+ //
+
+ // if Jan 1 is Thursday or less, it is in the first week of this year
+ if ( wdYearStart < 4 )
+ {
+ // count the number of entire weeks between Jan 1 and this date
+ week = (nDayInYear + wdYearStart + 6 - wdTarget)/7;
+
+ // be careful to check for overflow in the next year
+ if ( week == 53 && tm.mday - wdTarget > 28 )
+ week = 1;
+ }
+ else // Jan 1 is in the last week of the previous year
+ {
+ // check if we happen to be at the last week of previous year:
+ if ( tm.mon == Jan && tm.mday < 8 - wdYearStart )
+ week = wxDateTime(31, Dec, GetYear()-1).GetWeekOfYear();
+ else
+ week = (nDayInYear + wdYearStart - 1 - wdTarget)/7;
+ }
}
- return week;
+ return (wxDateTime::wxDateTime_t)week;
}
wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
const TimeZone& tz) const
{
Tm tm = GetTm(tz);
- wxDateTime dtMonthStart = wxDateTime(1, tm.mon, tm.year);
- int nWeek = GetWeekOfYear(flags) - dtMonthStart.GetWeekOfYear(flags) + 1;
- if ( nWeek < 0 )
+ const wxDateTime dateFirst = wxDateTime(1, tm.mon, tm.year);
+ const wxDateTime::WeekDay wdFirst = dateFirst.GetWeekDay();
+
+ if ( flags == Default_First )
{
- // this may happen for January when Jan, 1 is the last week of the
- // previous year
- nWeek += IsLeapYear(tm.year - 1) ? 53 : 52;
+ flags = GetCountry() == USA ? Sunday_First : Monday_First;
}
- return (wxDateTime::wxDateTime_t)nWeek;
+ // compute offset of dateFirst from the beginning of the week
+ int firstOffset;
+ if ( flags == Sunday_First )
+ firstOffset = wdFirst - Sun;
+ else
+ firstOffset = wdFirst == Sun ? DAYS_PER_WEEK - 1 : wdFirst - Mon;
+
+ return (wxDateTime::wxDateTime_t)((tm.mday - 1 + firstOffset)/7 + 1);
}
wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
{
int year = GetYear();
wxDATETIME_CHECK( (0 < yday) && (yday <= GetNumberOfDays(year)),
- _T("invalid year day") );
+ wxT("invalid year day") );
bool isLeap = IsLeapYear(year);
for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) )
// for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
// don't need it neither - because of the CHECK above we know that
// yday lies in December then
- if ( (mon == Dec) || (yday < gs_cumulatedDays[isLeap][mon + 1]) )
+ if ( (mon == Dec) || (yday <= gs_cumulatedDays[isLeap][mon + 1]) )
{
- Set(yday - gs_cumulatedDays[isLeap][mon], mon, year);
+ Set((wxDateTime::wxDateTime_t)(yday - gs_cumulatedDays[isLeap][mon]), mon, year);
break;
}
double wxDateTime::GetJulianDayNumber() const
{
- // JDN are always expressed for the GMT dates
- Tm tm(ToTimezone(GMT0).GetTm(GMT0));
-
- double result = GetTruncatedJDN(tm.mday, tm.mon, tm.year);
-
- // add the part GetTruncatedJDN() neglected
- result += 0.5;
-
- // and now add the time: 86400 sec = 1 JDN
- return result + ((double)(60*(60*tm.hour + tm.min) + tm.sec)) / 86400;
+ return m_time.ToDouble() / MILLISECONDS_PER_DAY + EPOCH_JDN + 0.5;
}
double wxDateTime::GetRataDie() const
int wxDateTime::IsDST(wxDateTime::Country country) const
{
wxCHECK_MSG( country == Country_Default, -1,
- _T("country support not implemented") );
+ wxT("country support not implemented") );
// use the C RTL for the dates in the standard range
time_t timet = GetTicks();
if ( timet != (time_t)-1 )
{
- tm *tm = localtime(&timet);
+ struct tm tmstruct;
+ tm *tm = wxLocaltime_r(&timet, &tmstruct);
- wxCHECK_MSG( tm, -1, _T("localtime() failed") );
+ wxCHECK_MSG( tm, -1, wxT("wxLocaltime_r() failed") );
return tm->tm_isdst;
}
wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
{
- long secDiff = GetTimeZone() + tz.GetOffset();
+ long secDiff = wxGetTimeZone() + tz.GetOffset();
// we need to know whether DST is or not in effect for this date unless
// the test disabled by the caller
secDiff -= 3600;
}
- return Subtract(wxTimeSpan::Seconds(secDiff));
+ return Add(wxTimeSpan::Seconds(secDiff));
}
-// ----------------------------------------------------------------------------
-// wxDateTime to/from text representations
-// ----------------------------------------------------------------------------
-
-wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
-{
- wxCHECK_MSG( format, _T(""), _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
- time_t time = GetTicks();
- if ( (time != (time_t)-1) && !wxStrstr(format, _T("%l")) )
- {
- // use strftime()
- tm *tm;
- if ( tz.GetOffset() == -GetTimeZone() )
- {
- // we are working with local time
- tm = localtime(&time);
-
- // should never happen
- wxCHECK_MSG( tm, wxEmptyString, _T("localtime() failed") );
- }
- else
- {
- time += (int)tz.GetOffset();
-
-#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
- int time2 = (int) time;
- if ( time2 >= 0 )
-#else
- if ( time >= 0 )
-#endif
- {
- tm = gmtime(&time);
-
- // should never happen
- wxCHECK_MSG( tm, wxEmptyString, _T("gmtime() failed") );
- }
- else
- {
- tm = (struct tm *)NULL;
- }
- }
-
- if ( tm )
- {
- return CallStrftime(format, tm);
- }
- //else: use generic code below
- }
-
- // we only parse ANSI C format specifications here, no POSIX 2
- // complications, no GNU extensions but we do add support for a "%l" format
- // specifier allowing to get the number of milliseconds
- Tm tm = GetTm(tz);
-
- // used for calls to strftime() when we only deal with time
- struct tm tmTimeOnly;
- tmTimeOnly.tm_hour = tm.hour;
- tmTimeOnly.tm_min = tm.min;
- tmTimeOnly.tm_sec = tm.sec;
- tmTimeOnly.tm_wday = 0;
- tmTimeOnly.tm_yday = 0;
- tmTimeOnly.tm_mday = 1; // any date will do
- tmTimeOnly.tm_mon = 0;
- tmTimeOnly.tm_year = 76;
- tmTimeOnly.tm_isdst = 0; // no DST, we adjust for tz ourselves
-
- wxString tmp, res, fmt;
- for ( const wxChar *p = format; *p; p++ )
- {
- if ( *p != _T('%') )
- {
- // copy as is
- res += *p;
-
- continue;
- }
-
- // set the default format
- switch ( *++p )
- {
- case _T('Y'): // year has 4 digits
- fmt = _T("%04d");
- break;
-
- case _T('j'): // day of year has 3 digits
- case _T('l'): // milliseconds have 3 digits
- fmt = _T("%03d");
- break;
-
- default:
- // it's either another valid format specifier in which case
- // the format is "%02d" (for all the rest) or we have the
- // field width preceding the format in which case it will
- // override the default format anyhow
- fmt = _T("%02d");
- }
-
- bool restart = TRUE;
- while ( restart )
- {
- restart = FALSE;
-
- // start of the format specification
- switch ( *p )
- {
- case _T('a'): // a weekday name
- case _T('A'):
- // second parameter should be TRUE for abbreviated names
- res += GetWeekDayName(tm.GetWeekDay(),
- *p == _T('a') ? Name_Abbr : Name_Full);
- break;
-
- case _T('b'): // a month name
- case _T('B'):
- res += GetMonthName(tm.mon,
- *p == _T('b') ? Name_Abbr : Name_Full);
- break;
-
- case _T('c'): // locale default date and time representation
- case _T('x'): // locale default date representation
- //
- // the problem: there is no way to know what do these format
- // specifications correspond to for the current locale.
- //
- // the solution: use a hack and still use strftime(): first
- // find the YEAR which is a year in the strftime() range (1970
- // - 2038) whose Jan 1 falls on the same week day as the Jan 1
- // of the real year. Then make a copy of the format and
- // replace all occurences of YEAR in it with some unique
- // string not appearing anywhere else in it, then use
- // strftime() to format the date in year YEAR and then replace
- // YEAR back by the real year and the unique replacement
- // string back with YEAR. Notice that "all occurences of YEAR"
- // means all occurences of 4 digit as well as 2 digit form!
- //
- // the bugs: we assume that neither of %c nor %x contains any
- // fields which may change between the YEAR and real year. For
- // example, the week number (%U, %W) and the day number (%j)
- // will change if one of these years is leap and the other one
- // is not!
- {
- // find the YEAR: normally, for any year X, Jan 1 or the
- // year X + 28 is the same weekday as Jan 1 of X (because
- // the weekday advances by 1 for each normal X and by 2
- // for each leap X, hence by 5 every 4 years or by 35
- // which is 0 mod 7 every 28 years) but this rule breaks
- // down if there are years between X and Y which are
- // divisible by 4 but not leap (i.e. divisible by 100 but
- // not 400), hence the correction.
-
- int yearReal = GetYear(tz);
- int mod28 = yearReal % 28;
-
- // be careful to not go too far - we risk to leave the
- // supported range
- int year;
- if ( mod28 < 10 )
- {
- year = 1988 + mod28; // 1988 == 0 (mod 28)
- }
- else
- {
- year = 1970 + mod28 - 10; // 1970 == 10 (mod 28)
- }
-
- int nCentury = year / 100,
- nCenturyReal = yearReal / 100;
-
- // need to adjust for the years divisble by 400 which are
- // not leap but are counted like leap ones if we just take
- // the number of centuries in between for nLostWeekDays
- int nLostWeekDays = (nCentury - nCenturyReal) -
- (nCentury / 4 - nCenturyReal / 4);
-
- // we have to gain back the "lost" weekdays: note that the
- // effect of this loop is to not do anything to
- // nLostWeekDays (which we won't use any more), but to
- // (indirectly) set the year correctly
- while ( (nLostWeekDays % 7) != 0 )
- {
- nLostWeekDays += year++ % 4 ? 1 : 2;
- }
-
- // at any rate, we couldn't go further than 1988 + 9 + 28!
- wxASSERT_MSG( year < 2030,
- _T("logic error in wxDateTime::Format") );
-
- wxString strYear, strYear2;
- strYear.Printf(_T("%d"), year);
- strYear2.Printf(_T("%d"), year % 100);
-
- // find two strings not occuring in format (this is surely
- // not optimal way of doing it... improvements welcome!)
- wxString fmt = format;
- wxString replacement = (wxChar)-1;
- while ( fmt.Find(replacement) != wxNOT_FOUND )
- {
- replacement << (wxChar)-1;
- }
-
- wxString replacement2 = (wxChar)-2;
- while ( fmt.Find(replacement) != wxNOT_FOUND )
- {
- replacement << (wxChar)-2;
- }
-
- // replace all occurences of year with it
- bool wasReplaced = fmt.Replace(strYear, replacement) > 0;
- if ( !wasReplaced )
- wasReplaced = fmt.Replace(strYear2, replacement2) > 0;
-
- // use strftime() to format the same date but in supported
- // year
- //
- // NB: we assume that strftime() doesn't check for the
- // date validity and will happily format the date
- // corresponding to Feb 29 of a non leap year (which
- // may happen if yearReal was leap and year is not)
- struct tm tmAdjusted;
- InitTm(tmAdjusted);
- tmAdjusted.tm_hour = tm.hour;
- tmAdjusted.tm_min = tm.min;
- tmAdjusted.tm_sec = tm.sec;
- tmAdjusted.tm_wday = tm.GetWeekDay();
- tmAdjusted.tm_yday = GetDayOfYear();
- tmAdjusted.tm_mday = tm.mday;
- tmAdjusted.tm_mon = tm.mon;
- tmAdjusted.tm_year = year - 1900;
- tmAdjusted.tm_isdst = 0; // no DST, already adjusted
- wxString str = CallStrftime(*p == _T('c') ? _T("%c")
- : _T("%x"),
- &tmAdjusted);
-
- // now replace the occurence of 1999 with the real year
- wxString strYearReal, strYearReal2;
- strYearReal.Printf(_T("%04d"), yearReal);
- strYearReal2.Printf(_T("%02d"), yearReal % 100);
- str.Replace(strYear, strYearReal);
- str.Replace(strYear2, strYearReal2);
-
- // and replace back all occurences of replacement string
- if ( wasReplaced )
- {
- str.Replace(replacement2, strYear2);
- str.Replace(replacement, strYear);
- }
-
- res += str;
- }
- break;
-
- case _T('d'): // day of a month (01-31)
- res += wxString::Format(fmt, tm.mday);
- break;
-
- case _T('H'): // hour in 24h format (00-23)
- res += wxString::Format(fmt, tm.hour);
- break;
-
- case _T('I'): // hour in 12h format (01-12)
- {
- // 24h -> 12h, 0h -> 12h too
- int hour12 = tm.hour > 12 ? tm.hour - 12
- : tm.hour ? tm.hour : 12;
- res += wxString::Format(fmt, hour12);
- }
- break;
-
- case _T('j'): // day of the year
- res += wxString::Format(fmt, GetDayOfYear(tz));
- break;
-
- case _T('l'): // milliseconds (NOT STANDARD)
- res += wxString::Format(fmt, GetMillisecond(tz));
- break;
-
- case _T('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)
- res += wxString::Format(fmt, tm.min);
- break;
-
- case _T('p'): // AM or PM string
- res += CallStrftime(_T("%p"), &tmTimeOnly);
- break;
-
- case _T('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)
- res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
- break;
-
- case _T('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
- res += wxString::Format(fmt, tm.GetWeekDay());
- break;
-
- // case _T('x'): -- handled with "%c"
-
- case _T('X'): // locale default time representation
- // just use strftime() to format the time for us
- res += CallStrftime(_T("%X"), &tmTimeOnly);
- break;
-
- case _T('y'): // year without century (00-99)
- res += wxString::Format(fmt, tm.year % 100);
- break;
-
- case _T('Y'): // year with century
- res += wxString::Format(fmt, tm.year);
- break;
-
- case _T('Z'): // timezone name
- res += CallStrftime(_T("%Z"), &tmTimeOnly);
- break;
-
- default:
- // is it the format width?
- fmt.Empty();
- while ( *p == _T('-') || *p == _T('+') ||
- *p == _T(' ') || wxIsdigit(*p) )
- {
- fmt += *p;
- }
-
- if ( !fmt.IsEmpty() )
- {
- // we've only got the flags and width so far in fmt
- fmt.Prepend(_T('%'));
- fmt.Append(_T('d'));
-
- restart = TRUE;
-
- break;
- }
-
- // no, it wasn't the width
- wxFAIL_MSG(_T("unknown format specificator"));
-
- // fall through and just copy it nevertheless
-
- case _T('%'): // a percent sign
- res += *p;
- break;
-
- case 0: // the end of string
- wxFAIL_MSG(_T("missing format at the end of string"));
-
- // just put the '%' which was the last char in format
- res += _T('%');
- break;
- }
- }
- }
-
- return res;
-}
-
-// this function parses a string in (strict) RFC 822 format: see the section 5
-// of the RFC for the detailed description, but briefly it's something of the
-// form "Sat, 18 Dec 1999 00:48:30 +0100"
-//
-// this function is "strict" by design - it must reject anything except true
-// RFC822 time specs.
-//
-// TODO a great candidate for using reg exps
-const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
-{
- wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
-
- const wxChar *p = date;
- const wxChar *comma = wxStrchr(p, _T(','));
- if ( comma )
- {
- // the part before comma is the weekday
-
- // skip it for now - we don't use but might check that it really
- // corresponds to the specfied date
- p = comma + 1;
-
- if ( *p != _T(' ') )
- {
- wxLogDebug(_T("no space after weekday in RFC822 time spec"));
-
- return (wxChar *)NULL;
- }
-
- p++; // skip space
- }
-
- // the following 1 or 2 digits are the day number
- if ( !wxIsdigit(*p) )
- {
- wxLogDebug(_T("day number expected in RFC822 time spec, none found"));
-
- return (wxChar *)NULL;
- }
-
- wxDateTime_t day = *p++ - _T('0');
- if ( wxIsdigit(*p) )
- {
- day *= 10;
- day += *p++ - _T('0');
- }
-
- if ( *p++ != _T(' ') )
- {
- return (wxChar *)NULL;
- }
-
- // the following 3 letters specify the month
- wxString monName(p, 3);
- Month mon;
- if ( monName == _T("Jan") )
- mon = Jan;
- else if ( monName == _T("Feb") )
- mon = Feb;
- else if ( monName == _T("Mar") )
- mon = Mar;
- else if ( monName == _T("Apr") )
- mon = Apr;
- else if ( monName == _T("May") )
- mon = May;
- else if ( monName == _T("Jun") )
- mon = Jun;
- else if ( monName == _T("Jul") )
- mon = Jul;
- else if ( monName == _T("Aug") )
- mon = Aug;
- else if ( monName == _T("Sep") )
- mon = Sep;
- else if ( monName == _T("Oct") )
- mon = Oct;
- else if ( monName == _T("Nov") )
- mon = Nov;
- else if ( monName == _T("Dec") )
- mon = Dec;
- else
- {
- wxLogDebug(_T("Invalid RFC 822 month name '%s'"), monName.c_str());
-
- return (wxChar *)NULL;
- }
-
- p += 3;
-
- if ( *p++ != _T(' ') )
- {
- return (wxChar *)NULL;
- }
-
- // next is the year
- if ( !wxIsdigit(*p) )
- {
- // no year?
- return (wxChar *)NULL;
- }
-
- int year = *p++ - _T('0');
-
- if ( !wxIsdigit(*p) )
- {
- // should have at least 2 digits in the year
- return (wxChar *)NULL;
- }
-
- year *= 10;
- year += *p++ - _T('0');
-
- // is it a 2 digit year (as per original RFC 822) or a 4 digit one?
- if ( wxIsdigit(*p) )
- {
- year *= 10;
- year += *p++ - _T('0');
-
- if ( !wxIsdigit(*p) )
- {
- // no 3 digit years please
- return (wxChar *)NULL;
- }
-
- year *= 10;
- year += *p++ - _T('0');
- }
-
- if ( *p++ != _T(' ') )
- {
- return (wxChar *)NULL;
- }
-
- // time is in the format hh:mm:ss and seconds are optional
- if ( !wxIsdigit(*p) )
- {
- return (wxChar *)NULL;
- }
-
- wxDateTime_t hour = *p++ - _T('0');
-
- if ( !wxIsdigit(*p) )
- {
- return (wxChar *)NULL;
- }
-
- hour *= 10;
- hour += *p++ - _T('0');
-
- if ( *p++ != _T(':') )
- {
- return (wxChar *)NULL;
- }
-
- if ( !wxIsdigit(*p) )
- {
- return (wxChar *)NULL;
- }
-
- wxDateTime_t min = *p++ - _T('0');
-
- if ( !wxIsdigit(*p) )
- {
- return (wxChar *)NULL;
- }
-
- min *= 10;
- min += *p++ - _T('0');
-
- wxDateTime_t sec = 0;
- if ( *p++ == _T(':') )
- {
- if ( !wxIsdigit(*p) )
- {
- return (wxChar *)NULL;
- }
-
- sec = *p++ - _T('0');
-
- if ( !wxIsdigit(*p) )
- {
- return (wxChar *)NULL;
- }
-
- sec *= 10;
- sec += *p++ - _T('0');
- }
-
- if ( *p++ != _T(' ') )
- {
- return (wxChar *)NULL;
- }
-
- // and now the interesting part: the timezone
- int offset;
- if ( *p == _T('-') || *p == _T('+') )
- {
- // the explicit offset given: it has the form of hhmm
- bool plus = *p++ == _T('+');
-
- if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
- {
- return (wxChar *)NULL;
- }
-
- // hours
- offset = 60*(10*(*p - _T('0')) + (*(p + 1) - _T('0')));
-
- p += 2;
-
- if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
- {
- return (wxChar *)NULL;
- }
-
- // minutes
- offset += 10*(*p - _T('0')) + (*(p + 1) - _T('0'));
-
- if ( !plus )
- {
- offset = -offset;
- }
-
- p += 2;
- }
- else
- {
- // the symbolic timezone given: may be either military timezone or one
- // of standard abbreviations
- if ( !*(p + 1) )
- {
- // military: Z = UTC, J unused, A = -1, ..., Y = +12
- static const int offsets[26] =
- {
- //A B C D E F G H I J K L M
- -1, -2, -3, -4, -5, -6, -7, -8, -9, 0, -10, -11, -12,
- //N O P R Q S T U V W Z Y Z
- +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, 0
- };
-
- if ( *p < _T('A') || *p > _T('Z') || *p == _T('J') )
- {
- wxLogDebug(_T("Invalid militaty timezone '%c'"), *p);
-
- return (wxChar *)NULL;
- }
-
- offset = offsets[*p++ - _T('A')];
- }
- else
- {
- // abbreviation
- wxString tz = p;
- if ( tz == _T("UT") || tz == _T("UTC") || tz == _T("GMT") )
- offset = 0;
- else if ( tz == _T("AST") )
- offset = AST - GMT0;
- else if ( tz == _T("ADT") )
- offset = ADT - GMT0;
- else if ( tz == _T("EST") )
- offset = EST - GMT0;
- else if ( tz == _T("EDT") )
- offset = EDT - GMT0;
- else if ( tz == _T("CST") )
- offset = CST - GMT0;
- else if ( tz == _T("CDT") )
- offset = CDT - GMT0;
- else if ( tz == _T("MST") )
- offset = MST - GMT0;
- else if ( tz == _T("MDT") )
- offset = MDT - GMT0;
- else if ( tz == _T("PST") )
- offset = PST - GMT0;
- else if ( tz == _T("PDT") )
- offset = PDT - GMT0;
- else
- {
- wxLogDebug(_T("Unknown RFC 822 timezone '%s'"), p);
-
- return (wxChar *)NULL;
- }
-
- p += tz.length();
- }
-
- // make it minutes
- offset *= 60;
- }
-
- // the spec was correct
- Set(day, mon, year, hour, min, sec);
- MakeTimezone((wxDateTime_t)(60*offset));
-
- return p;
-}
-
-const wxChar *wxDateTime::ParseFormat(const wxChar *date,
- const wxChar *format,
- const wxDateTime& dateDef)
-{
- wxCHECK_MSG( date && format, (wxChar *)NULL,
- _T("NULL pointer in wxDateTime::ParseFormat()") );
-
- wxString str;
- unsigned long num;
-
- // what fields have we found?
- bool haveWDay = FALSE,
- haveYDay = FALSE,
- haveDay = FALSE,
- haveMon = FALSE,
- haveYear = FALSE,
- haveHour = FALSE,
- haveMin = FALSE,
- haveSec = FALSE;
-
- bool hourIsIn12hFormat = FALSE, // or in 24h one?
- isPM = FALSE; // AM by default
-
- // and the value of the items we have (init them to get rid of warnings)
- wxDateTime_t sec = 0,
- min = 0,
- hour = 0;
- WeekDay wday = Inv_WeekDay;
- wxDateTime_t yday = 0,
- mday = 0;
- wxDateTime::Month mon = Inv_Month;
- int year = 0;
-
- const wxChar *input = date;
- for ( const wxChar *fmt = format; *fmt; fmt++ )
- {
- if ( *fmt != _T('%') )
- {
- if ( wxIsspace(*fmt) )
- {
- // a white space in the format string matches 0 or more white
- // spaces in the input
- while ( wxIsspace(*input) )
- {
- input++;
- }
- }
- else // !space
- {
- // any other character (not whitespace, not '%') must be
- // matched by itself in the input
- if ( *input++ != *fmt )
- {
- // no match
- return (wxChar *)NULL;
- }
- }
-
- // done with this format char
- continue;
- }
-
- // start of a format specification
-
- // parse the optional width
- size_t width = 0;
- while ( isdigit(*++fmt) )
- {
- width *= 10;
- width += *fmt - _T('0');
- }
-
- // then the format itself
- switch ( *fmt )
- {
- case _T('a'): // a weekday name
- case _T('A'):
- {
- int flag = *fmt == _T('a') ? Name_Abbr : Name_Full;
- wday = GetWeekDayFromName(GetAlphaToken(input), flag);
- if ( wday == Inv_WeekDay )
- {
- // no match
- return (wxChar *)NULL;
- }
- }
- haveWDay = TRUE;
- break;
-
- case _T('b'): // a month name
- case _T('B'):
- {
- int flag = *fmt == _T('b') ? Name_Abbr : Name_Full;
- mon = GetMonthFromName(GetAlphaToken(input), flag);
- if ( mon == Inv_Month )
- {
- // no match
- return (wxChar *)NULL;
- }
- }
- haveMon = TRUE;
- break;
-
- case _T('c'): // locale default date and time representation
- {
- wxDateTime dt;
-
- // this is the format which corresponds to ctime() output
- // and strptime("%c") should parse it, so try it first
- static const wxChar *fmtCtime = _T("%a %b %d %H:%M:%S %Y");
-
- const wxChar *result = dt.ParseFormat(input, fmtCtime);
- if ( !result )
- {
- result = dt.ParseFormat(input, _T("%x %X"));
- }
-
- if ( !result )
- {
- result = dt.ParseFormat(input, _T("%X %x"));
- }
-
- if ( !result )
- {
- // we've tried everything and still no match
- return (wxChar *)NULL;
- }
-
- Tm tm = dt.GetTm();
-
- haveDay = haveMon = haveYear =
- haveHour = haveMin = haveSec = TRUE;
-
- hour = tm.hour;
- min = tm.min;
- sec = tm.sec;
-
- year = tm.year;
- mon = tm.mon;
- mday = tm.mday;
-
- input = result;
- }
- break;
-
- case _T('d'): // day of a month (01-31)
- if ( !GetNumericToken(width, input, &num) ||
- (num > 31) || (num < 1) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- // we can't check whether the day range is correct yet, will
- // do it later - assume ok for now
- haveDay = TRUE;
- mday = (wxDateTime_t)num;
- break;
-
- case _T('H'): // hour in 24h format (00-23)
- if ( !GetNumericToken(width, input, &num) || (num > 23) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveHour = TRUE;
- hour = (wxDateTime_t)num;
- break;
-
- case _T('I'): // hour in 12h format (01-12)
- if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveHour = TRUE;
- hourIsIn12hFormat = TRUE;
- hour = (wxDateTime_t)(num % 12); // 12 should be 0
- break;
-
- case _T('j'): // day of the year
- if ( !GetNumericToken(width, input, &num) || !num || (num > 366) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveYDay = TRUE;
- yday = (wxDateTime_t)num;
- break;
-
- case _T('m'): // month as a number (01-12)
- if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveMon = TRUE;
- mon = (Month)(num - 1);
- break;
-
- case _T('M'): // minute as a decimal number (00-59)
- if ( !GetNumericToken(width, input, &num) || (num > 59) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveMin = TRUE;
- min = (wxDateTime_t)num;
- break;
-
- case _T('p'): // AM or PM string
- {
- wxString am, pm, token = GetAlphaToken(input);
-
- GetAmPmStrings(&am, &pm);
- if ( token.CmpNoCase(pm) == 0 )
- {
- isPM = TRUE;
- }
- else if ( token.CmpNoCase(am) != 0 )
- {
- // no match
- return (wxChar *)NULL;
- }
- }
- break;
-
- case _T('r'): // time as %I:%M:%S %p
- {
- wxDateTime dt;
- input = dt.ParseFormat(input, _T("%I:%M:%S %p"));
- if ( !input )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveHour = haveMin = haveSec = TRUE;
-
- Tm tm = dt.GetTm();
- hour = tm.hour;
- min = tm.min;
- sec = tm.sec;
- }
- break;
-
- case _T('R'): // time as %H:%M
- {
- wxDateTime dt;
- input = dt.ParseFormat(input, _T("%H:%M"));
- if ( !input )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveHour = haveMin = TRUE;
-
- Tm tm = dt.GetTm();
- hour = tm.hour;
- min = tm.min;
- }
-
- case _T('S'): // second as a decimal number (00-61)
- if ( !GetNumericToken(width, input, &num) || (num > 61) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveSec = TRUE;
- sec = (wxDateTime_t)num;
- break;
-
- case _T('T'): // time as %H:%M:%S
- {
- wxDateTime dt;
- input = dt.ParseFormat(input, _T("%H:%M:%S"));
- if ( !input )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveHour = haveMin = haveSec = TRUE;
-
- Tm tm = dt.GetTm();
- hour = tm.hour;
- min = tm.min;
- sec = tm.sec;
- }
- break;
-
- case _T('w'): // weekday as a number (0-6), Sunday = 0
- if ( !GetNumericToken(width, input, &num) || (wday > 6) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveWDay = TRUE;
- wday = (WeekDay)num;
- break;
-
- case _T('x'): // locale default date representation
-#ifdef HAVE_STRPTIME
- // try using strptime() - it may fail even if the input is
- // correct but the date is out of range, so we will fall back
- // to our generic code anyhow (FIXME !Unicode friendly)
- {
- struct tm tm;
- const wxChar *result = strptime(input, "%x", &tm);
- if ( result )
- {
- input = result;
-
- haveDay = haveMon = haveYear = TRUE;
-
- year = 1900 + tm.tm_year;
- mon = (Month)tm.tm_mon;
- mday = tm.tm_mday;
-
- break;
- }
- }
-#endif // HAVE_STRPTIME
-
- // TODO query the LOCALE_IDATE setting under Win32
- {
- wxDateTime dt;
-
- wxString fmtDate, fmtDateAlt;
- if ( IsWestEuropeanCountry(GetCountry()) ||
- GetCountry() == Russia )
- {
- fmtDate = _T("%d/%m/%y");
- fmtDateAlt = _T("%m/%d/%y");
- }
- else // assume USA
- {
- fmtDate = _T("%m/%d/%y");
- fmtDateAlt = _T("%d/%m/%y");
- }
-
- const wxChar *result = dt.ParseFormat(input, fmtDate);
-
- if ( !result )
- {
- // ok, be nice and try another one
- result = dt.ParseFormat(input, fmtDateAlt);
- }
-
- if ( !result )
- {
- // bad luck
- return (wxChar *)NULL;
- }
-
- Tm tm = dt.GetTm();
-
- haveDay = haveMon = haveYear = TRUE;
-
- year = tm.year;
- mon = tm.mon;
- mday = tm.mday;
-
- input = result;
- }
-
- break;
-
- case _T('X'): // locale default time representation
-#ifdef HAVE_STRPTIME
- {
- // use strptime() to do it for us (FIXME !Unicode friendly)
- struct tm tm;
- input = strptime(input, "%X", &tm);
- if ( !input )
- {
- return (wxChar *)NULL;
- }
-
- haveHour = haveMin = haveSec = TRUE;
-
- hour = tm.tm_hour;
- min = tm.tm_min;
- sec = tm.tm_sec;
- }
-#else // !HAVE_STRPTIME
- // TODO under Win32 we can query the LOCALE_ITIME system
- // setting which says whether the default time format is
- // 24 or 12 hour
- {
- // try to parse what follows as "%H:%M:%S" and, if this
- // fails, as "%I:%M:%S %p" - this should catch the most
- // common cases
- wxDateTime dt;
-
- const wxChar *result = dt.ParseFormat(input, _T("%T"));
- if ( !result )
- {
- result = dt.ParseFormat(input, _T("%r"));
- }
-
- if ( !result )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveHour = haveMin = haveSec = TRUE;
-
- Tm tm = dt.GetTm();
- hour = tm.hour;
- min = tm.min;
- sec = tm.sec;
-
- input = result;
- }
-#endif // HAVE_STRPTIME/!HAVE_STRPTIME
- break;
-
- case _T('y'): // year without century (00-99)
- if ( !GetNumericToken(width, input, &num) || (num > 99) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveYear = TRUE;
-
- // TODO should have an option for roll over date instead of
- // hard coding it here
- year = (num > 30 ? 1900 : 2000) + (wxDateTime_t)num;
- break;
-
- case _T('Y'): // year with century
- if ( !GetNumericToken(width, input, &num) )
- {
- // no match
- return (wxChar *)NULL;
- }
-
- haveYear = TRUE;
- year = (wxDateTime_t)num;
- break;
-
- case _T('Z'): // timezone name
- wxFAIL_MSG(_T("TODO"));
- break;
-
- case _T('%'): // a percent sign
- if ( *input++ != _T('%') )
- {
- // no match
- return (wxChar *)NULL;
- }
- break;
-
- case 0: // the end of string
- wxFAIL_MSG(_T("unexpected format end"));
-
- // fall through
-
- default: // not a known format spec
- return (wxChar *)NULL;
- }
- }
-
- // format matched, try to construct a date from what we have now
- Tm tmDef;
- if ( dateDef.IsValid() )
- {
- // take this date as default
- tmDef = dateDef.GetTm();
- }
-#ifdef __WIN16__
- else if ( m_time != 0 )
-#else
- else if ( m_time != wxLongLong(0) )
-#endif
- {
- // if this date is valid, don't change it
- tmDef = GetTm();
- }
- else
- {
- // no default and this date is invalid - fall back to Today()
- tmDef = Today().GetTm();
- }
-
- Tm tm = tmDef;
-
- // set the date
- if ( haveYear )
- {
- tm.year = year;
- }
-
- // TODO we don't check here that the values are consistent, if both year
- // day and month/day were found, we just ignore the year day and we
- // also always ignore the week day
- if ( haveMon && haveDay )
- {
- if ( mday > GetNumOfDaysInMonth(tm.year, mon) )
- {
- wxLogDebug(_T("bad month day in wxDateTime::ParseFormat"));
-
- return (wxChar *)NULL;
- }
-
- tm.mon = mon;
- tm.mday = mday;
- }
- else if ( haveYDay )
- {
- if ( yday > GetNumberOfDays(tm.year) )
- {
- wxLogDebug(_T("bad year day in wxDateTime::ParseFormat"));
-
- return (wxChar *)NULL;
- }
-
- Tm tm2 = wxDateTime(1, Jan, tm.year).SetToYearDay(yday).GetTm();
-
- tm.mon = tm2.mon;
- tm.mday = tm2.mday;
- }
-
- // deal with AM/PM
- if ( haveHour && hourIsIn12hFormat && isPM )
- {
- // translate to 24hour format
- hour += 12;
- }
- //else: either already in 24h format or no translation needed
-
- // set the time
- if ( haveHour )
- {
- tm.hour = hour;
- }
-
- if ( haveMin )
- {
- tm.min = min;
- }
-
- if ( haveSec )
- {
- tm.sec = sec;
- }
-
- Set(tm);
-
- return input;
-}
-
-const wxChar *wxDateTime::ParseDateTime(const wxChar *date)
-{
- wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
-
- // there is a public domain version of getdate.y, but it only works for
- // English...
- wxFAIL_MSG(_T("TODO"));
-
- return (wxChar *)NULL;
-}
-
-const wxChar *wxDateTime::ParseDate(const wxChar *date)
-{
- // 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;
- while ( wxIsspace(*p) )
- p++;
-
- // some special cases
- static struct
- {
- const wxChar *str;
- int dayDiffFromToday;
- } literalDates[] =
- {
- { wxTRANSLATE("today"), 0 },
- { wxTRANSLATE("yesterday"), -1 },
- { wxTRANSLATE("tomorrow"), 1 },
- };
-
- for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ )
- {
- wxString date = wxGetTranslation(literalDates[n].str);
- size_t len = date.length();
- if ( wxStrlen(p) >= len && (wxString(p, len).CmpNoCase(date) == 0) )
- {
- // nothing can follow this, so stop here
- p += len;
-
- int dayDiffFromToday = literalDates[n].dayDiffFromToday;
- *this = Today();
- if ( dayDiffFromToday )
- {
- *this += wxDateSpan::Days(dayDiffFromToday);
- }
-
- return p;
- }
- }
-
- // We try to guess what we have here: for each new (numeric) token, we
- // determine if it can be a month, day or a year. Of course, there is an
- // ambiguity as some numbers may be days as well as months, so we also
- // have the ability to back track.
-
- // what do we have?
- bool haveDay = FALSE, // the months day?
- haveWDay = FALSE, // the day of week?
- haveMon = FALSE, // the month?
- haveYear = FALSE; // the year?
-
- // and the value of the items we have (init them to get rid of warnings)
- WeekDay wday = Inv_WeekDay;
- wxDateTime_t day = 0;
- wxDateTime::Month mon = Inv_Month;
- int year = 0;
-
- // tokenize the string
- size_t nPosCur = 0;
- static const wxChar *dateDelimiters = _T(".,/-\t\n ");
- wxStringTokenizer tok(p, dateDelimiters);
- while ( tok.HasMoreTokens() )
- {
- wxString token = tok.GetNextToken();
- if ( !token )
- continue;
-
- // is it a number?
- unsigned long val;
- if ( token.ToULong(&val) )
- {
- // guess what this number is
-
- bool isDay = FALSE,
- isMonth = FALSE,
- isYear = FALSE;
-
- if ( !haveMon && val > 0 && val <= 12 )
- {
- // assume it is month
- isMonth = TRUE;
- }
- else // not the month
- {
- wxDateTime_t maxDays = haveMon
- ? GetNumOfDaysInMonth(haveYear ? year : Inv_Year, mon)
- : 31;
-
- // can it be day?
- if ( (val == 0) || (val > (unsigned long)maxDays) ) // cast to shut up compiler warning in BCC
- {
- isYear = TRUE;
- }
- else
- {
- isDay = TRUE;
- }
- }
-
- if ( isYear )
- {
- if ( haveYear )
- break;
-
- haveYear = TRUE;
-
- year = (wxDateTime_t)val;
- }
- else if ( isDay )
- {
- if ( haveDay )
- break;
-
- haveDay = TRUE;
-
- day = (wxDateTime_t)val;
- }
- else if ( isMonth )
- {
- haveMon = TRUE;
-
- mon = (Month)(val - 1);
- }
- }
- else // not a number
- {
- // be careful not to overwrite the current mon value
- Month mon2 = GetMonthFromName(token, Name_Full | Name_Abbr);
- if ( mon2 != Inv_Month )
- {
- // it's a month
- if ( haveMon )
- {
- // but we already have a month - maybe we guessed wrong?
- if ( !haveDay )
- {
- // no need to check in month range as always < 12, but
- // the days are counted from 1 unlike the months
- day = (wxDateTime_t)mon + 1;
- haveDay = TRUE;
- }
- else
- {
- // could possible be the year (doesn't the year come
- // before the month in the japanese format?) (FIXME)
- break;
- }
- }
-
- mon = mon2;
-
- haveMon = TRUE;
- }
- else // not a valid month name
- {
- wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
- if ( wday != Inv_WeekDay )
- {
- // a week day
- if ( haveWDay )
- {
- break;
- }
-
- haveWDay = TRUE;
- }
- else // not a valid weekday name
- {
- // try the ordinals
- static const wxChar *ordinals[] =
- {
- wxTRANSLATE("first"),
- wxTRANSLATE("second"),
- wxTRANSLATE("third"),
- wxTRANSLATE("fourth"),
- wxTRANSLATE("fifth"),
- wxTRANSLATE("sixth"),
- wxTRANSLATE("seventh"),
- wxTRANSLATE("eighth"),
- wxTRANSLATE("ninth"),
- wxTRANSLATE("tenth"),
- wxTRANSLATE("eleventh"),
- wxTRANSLATE("twelfth"),
- wxTRANSLATE("thirteenth"),
- wxTRANSLATE("fourteenth"),
- wxTRANSLATE("fifteenth"),
- wxTRANSLATE("sixteenth"),
- wxTRANSLATE("seventeenth"),
- wxTRANSLATE("eighteenth"),
- wxTRANSLATE("nineteenth"),
- wxTRANSLATE("twentieth"),
- // that's enough - otherwise we'd have problems with
- // composite (or not) ordinals
- };
-
- size_t n;
- for ( n = 0; n < WXSIZEOF(ordinals); n++ )
- {
- if ( token.CmpNoCase(ordinals[n]) == 0 )
- {
- break;
- }
- }
-
- if ( n == WXSIZEOF(ordinals) )
- {
- // stop here - something unknown
- break;
- }
-
- // it's a day
- if ( haveDay )
- {
- // don't try anything here (as in case of numeric day
- // above) - the symbolic day spec should always
- // precede the month/year
- break;
- }
-
- haveDay = TRUE;
-
- day = (wxDateTime_t)(n + 1);
- }
- }
- }
-
- nPosCur = tok.GetPosition();
- }
-
- // either no more tokens or the scan was stopped by something we couldn't
- // parse - in any case, see if we can construct a date from what we have
- if ( !haveDay && !haveWDay )
- {
- wxLogDebug(_T("ParseDate: no day, no weekday hence no date."));
-
- return (wxChar *)NULL;
- }
-
- if ( haveWDay && (haveMon || haveYear || haveDay) &&
- !(haveDay && haveMon && haveYear) )
- {
- // without adjectives (which we don't support here) the week day only
- // makes sense completely separately or with the full date
- // specification (what would "Wed 1999" mean?)
- return (wxChar *)NULL;
- }
-
- if ( !haveWDay && haveYear && !(haveDay && haveMon) )
- {
- // may be we have month and day instead of day and year?
- if ( haveDay && !haveMon )
- {
- if ( day <= 12 )
- {
- // exchange day and month
- mon = (wxDateTime::Month)(day - 1);
-
- // we're in the current year then
- if ( year <= GetNumOfDaysInMonth(Inv_Year, mon) )
- {
- day = year;
-
- haveMon = TRUE;
- haveYear = FALSE;
- }
- //else: no, can't exchange, leave haveMon == FALSE
- }
- }
-
- if ( !haveMon )
- {
- // if we give the year, month and day must be given too
- wxLogDebug(_T("ParseDate: day and month should be specified if year is."));
-
- return (wxChar *)NULL;
- }
- }
-
- if ( !haveMon )
- {
- mon = GetCurrentMonth();
- }
-
- if ( !haveYear )
- {
- year = GetCurrentYear();
- }
-
- if ( haveDay )
- {
- Set(day, mon, year);
-
- if ( haveWDay )
- {
- // check that it is really the same
- if ( GetWeekDay() != wday )
- {
- // inconsistency detected
- wxLogDebug(_T("ParseDate: inconsistent day/weekday."));
-
- return (wxChar *)NULL;
- }
- }
- }
- else // haveWDay
- {
- *this = Today();
-
- SetToWeekDayInSameWeek(wday);
- }
-
- // return the pointer to the first unparsed char
- p += nPosCur;
- if ( nPosCur && wxStrchr(dateDelimiters, *(p - 1)) )
- {
- // if we couldn't parse the token after the delimiter, put back the
- // delimiter as well
- p--;
- }
-
- return p;
-}
-
-const wxChar *wxDateTime::ParseTime(const wxChar *time)
+wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
{
- wxCHECK_MSG( time, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
-
- // first try some extra things
- static const struct
- {
- const wxChar *name;
- wxDateTime_t hour;
- } stdTimes[] =
- {
- { wxTRANSLATE("noon"), 12 },
- { wxTRANSLATE("midnight"), 00 },
- // anything else?
- };
-
- for ( size_t n = 0; n < WXSIZEOF(stdTimes); n++ )
- {
- wxString timeString = wxGetTranslation(stdTimes[n].name);
- size_t len = timeString.length();
- if ( timeString.CmpNoCase(wxString(time, len)) == 0 )
- {
- Set(stdTimes[n].hour, 0, 0);
-
- return time + len;
- }
- }
-
- // try all time formats we may think about starting with the standard one
- const wxChar *result = ParseFormat(time, _T("%X"));
- if ( !result )
- {
- // normally, it's the same, but why not try it?
- result = ParseFormat(time, _T("%H:%M:%S"));
- }
-
- if ( !result )
- {
- // 12hour with AM/PM?
- result = ParseFormat(time, _T("%I:%M:%S %p"));
- }
-
- if ( !result )
- {
- // without seconds?
- result = ParseFormat(time, _T("%H:%M"));
- }
-
- if ( !result )
- {
- // 12hour with AM/PM but without seconds?
- result = ParseFormat(time, _T("%I:%M %p"));
- }
-
- if ( !result )
- {
- // just the hour?
- result = ParseFormat(time, _T("%H"));
- }
+ long secDiff = wxGetTimeZone() + tz.GetOffset();
- if ( !result )
+ // we need to know whether DST is or not in effect for this date unless
+ // the test disabled by the caller
+ if ( !noDST && (IsDST() == 1) )
{
- // just the hour and AM/PM?
- result = ParseFormat(time, _T("%I %p"));
- }
-
- // TODO: parse timezones
-
- return result;
-}
-
-// ----------------------------------------------------------------------------
-// Workdays and holidays support
-// ----------------------------------------------------------------------------
-
-bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const
-{
- return !wxDateTimeHolidayAuthority::IsHoliday(*this);
-}
-
-// ============================================================================
-// wxTimeSpan
-// ============================================================================
-
-// not all strftime(3) format specifiers make sense here because, for example,
-// a time span doesn't have a year nor a timezone
-//
-// Here are the ones which are supported (all of them are supported by strftime
-// as well):
-// %H hour in 24 hour format
-// %M minute (00 - 59)
-// %S second (00 - 59)
-// %% percent sign
-//
-// Also, for MFC CTimeSpan compatibility, we support
-// %D number of days
-//
-// And, to be better than MFC :-), we also have
-// %E number of wEeks
-// %l milliseconds (000 - 999)
-wxString wxTimeSpan::Format(const wxChar *format) const
-{
- wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") );
-
- wxString str;
- str.Alloc(wxStrlen(format));
-
- // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */)
- //
- // Then, of course, ts.Format("%H:%M:%S") must return "01:02:03", but the
- // question is what should ts.Format("%S") do? The code here returns "3273"
- // in this case (i.e. the total number of seconds, not just seconds % 60)
- // because, for me, this call means "give me entire time interval in
- // seconds" and not "give me the seconds part of the time interval"
- //
- // If we agree that it should behave like this, it is clear that the
- // interpretation of each format specifier depends on the presence of the
- // other format specs in the string: if there was "%H" before "%M", we
- // should use GetMinutes() % 60, otherwise just GetMinutes() &c
-
- // we remember the most important unit found so far
- enum TimeSpanPart
- {
- Part_Week,
- Part_Day,
- Part_Hour,
- Part_Min,
- Part_Sec,
- Part_MSec
- } partBiggest = Part_MSec;
-
- for ( const wxChar *pch = format; *pch; pch++ )
- {
- wxChar ch = *pch;
-
- if ( ch == _T('%') )
- {
- // the start of the format specification of the printf() below
- wxString fmtPrefix = _T('%');
-
- // the number
- long n;
-
- ch = *++pch; // get the format spec char
- switch ( ch )
- {
- default:
- wxFAIL_MSG( _T("invalid format character") );
- // fall through
-
- case _T('%'):
- str += ch;
-
- // skip the part below switch
- continue;
-
- case _T('D'):
- n = GetDays();
- if ( partBiggest < Part_Day )
- {
- n %= DAYS_PER_WEEK;
- }
- else
- {
- partBiggest = Part_Day;
- }
- break;
-
- case _T('E'):
- partBiggest = Part_Week;
- n = GetWeeks();
- break;
-
- case _T('H'):
- n = GetHours();
- if ( partBiggest < Part_Hour )
- {
- n %= HOURS_PER_DAY;
- }
- else
- {
- partBiggest = Part_Hour;
- }
-
- fmtPrefix += _T("02");
- break;
-
- case _T('l'):
- n = GetMilliseconds().ToLong();
- if ( partBiggest < Part_MSec )
- {
- n %= 1000;
- }
- //else: no need to reset partBiggest to Part_MSec, it is
- // the least significant one anyhow
-
- fmtPrefix += _T("03");
- break;
-
- case _T('M'):
- n = GetMinutes();
- if ( partBiggest < Part_Min )
- {
- n %= MIN_PER_HOUR;
- }
- else
- {
- partBiggest = Part_Min;
- }
-
- fmtPrefix += _T("02");
- break;
-
- case _T('S'):
- n = GetSeconds().ToLong();
- if ( partBiggest < Part_Sec )
- {
- n %= SEC_PER_MIN;
- }
- else
- {
- partBiggest = Part_Sec;
- }
-
- fmtPrefix += _T("02");
- break;
- }
-
- str += wxString::Format(fmtPrefix + _T("ld"), n);
- }
- else
- {
- // normal character, just copy
- str += ch;
- }
+ // FIXME we assume that the DST is always shifted by 1 hour
+ secDiff -= 3600;
}
- return str;
+ return Subtract(wxTimeSpan::Seconds(secDiff));
}
// ============================================================================
#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxDateTimeArray);
+WX_DEFINE_OBJARRAY(wxDateTimeArray)
static int wxCMPFUNC_CONV
wxDateTimeCompareFunc(wxDateTime **first, wxDateTime **second)
/* static */
bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
{
- size_t count = ms_authorities.GetCount();
+ size_t count = ms_authorities.size();
for ( size_t n = 0; n < count; n++ )
{
if ( ms_authorities[n]->DoIsHoliday(dt) )
{
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
/* static */
{
wxDateTimeArray hol;
- holidays.Empty();
+ holidays.Clear();
- size_t count = ms_authorities.GetCount();
- for ( size_t nAuth = 0; nAuth < count; nAuth++ )
+ const size_t countAuth = ms_authorities.size();
+ for ( size_t nAuth = 0; nAuth < countAuth; nAuth++ )
{
ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
holidays.Sort(wxDateTimeCompareFunc);
- return holidays.GetCount();
+ return holidays.size();
}
/* static */
/* static */
void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
{
- ms_authorities.Add(auth);
+ ms_authorities.push_back(auth);
+}
+
+wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
+{
+ // required here for Darwin
}
// ----------------------------------------------------------------------------
{
if ( dtStart > dtEnd )
{
- wxFAIL_MSG( _T("invalid date range in GetHolidaysInRange") );
+ wxFAIL_MSG( wxT("invalid date range in GetHolidaysInRange") );
return 0u;
}
return holidays.GetCount();
}
+// ============================================================================
+// other helper functions
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// iteration helpers: can be used to write a for loop over enum variable like
+// this:
+// for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
+// ----------------------------------------------------------------------------
+
+WXDLLIMPEXP_BASE void wxNextMonth(wxDateTime::Month& m)
+{
+ wxASSERT_MSG( m < wxDateTime::Inv_Month, wxT("invalid month") );
+
+ // no wrapping or the for loop above would never end!
+ m = (wxDateTime::Month)(m + 1);
+}
+
+WXDLLIMPEXP_BASE void wxPrevMonth(wxDateTime::Month& m)
+{
+ wxASSERT_MSG( m < wxDateTime::Inv_Month, wxT("invalid month") );
+
+ m = m == wxDateTime::Jan ? wxDateTime::Inv_Month
+ : (wxDateTime::Month)(m - 1);
+}
+
+WXDLLIMPEXP_BASE void wxNextWDay(wxDateTime::WeekDay& wd)
+{
+ wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, wxT("invalid week day") );
+
+ // no wrapping or the for loop above would never end!
+ wd = (wxDateTime::WeekDay)(wd + 1);
+}
+
+WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd)
+{
+ wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, wxT("invalid week day") );
+
+ wd = wd == wxDateTime::Sun ? wxDateTime::Inv_WeekDay
+ : (wxDateTime::WeekDay)(wd - 1);
+}
+
+#ifdef __WXMSW__
+
+wxDateTime& wxDateTime::SetFromMSWSysTime(const SYSTEMTIME& st)
+{
+ return Set(st.wDay,
+ static_cast<wxDateTime::Month>(wxDateTime::Jan + st.wMonth - 1),
+ st.wYear,
+ st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+}
+
+wxDateTime& wxDateTime::SetFromMSWSysDate(const SYSTEMTIME& st)
+{
+ return Set(st.wDay,
+ static_cast<wxDateTime::Month>(wxDateTime::Jan + st.wMonth - 1),
+ st.wYear,
+ 0, 0, 0, 0);
+}
+
+void wxDateTime::GetAsMSWSysTime(SYSTEMTIME* st) const
+{
+ const wxDateTime::Tm tm(GetTm());
+
+ st->wYear = (WXWORD)tm.year;
+ st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
+ st->wDay = tm.mday;
+
+ st->wDayOfWeek = 0;
+ st->wHour = tm.hour;
+ st->wMinute = tm.min;
+ st->wSecond = tm.sec;
+ st->wMilliseconds = tm.msec;
+}
+
+void wxDateTime::GetAsMSWSysDate(SYSTEMTIME* st) const
+{
+ const wxDateTime::Tm tm(GetTm());
+
+ st->wYear = (WXWORD)tm.year;
+ st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
+ st->wDay = tm.mday;
+
+ st->wDayOfWeek =
+ st->wHour =
+ st->wMinute =
+ st->wSecond =
+ st->wMilliseconds = 0;
+}
+
+#endif // __WXMSW__
+#endif // wxUSE_DATETIME
projects / wxWidgets.git / blobdiff