#pragma hdrstop
#endif
+#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
+
#ifndef WX_PRECOMP
#include "wx/string.h"
- #include "wx/intl.h"
#include "wx/log.h"
#endif // WX_PRECOMP
+#include "wx/intl.h"
#include "wx/thread.h"
#include "wx/tokenzr.h"
#include "wx/module.h"
#define WX_TIMEZONE _timezone
#elif defined(__MWERKS__)
long wxmw_timezone = 28800;
- #define WX_TIMEZONE wxmw_timezone;
+ #define WX_TIMEZONE wxmw_timezone
+ #elif defined(__DJGPP__)
+ #include <sys/timeb.h>
+ #include <values.h>
+ static long wxGetTimeZone()
+ {
+ static long timezone = MAXLONG; // invalid timezone
+ if (timezone == MAXLONG)
+ {
+ struct timeb tb;
+ ftime(&tb);
+ timezone = tb.timezone;
+ }
+ return timezone;
+ }
+ #define WX_TIMEZONE wxGetTimeZone()
#else // unknown platform - try timezone
#define WX_TIMEZONE timezone
#endif
#endif // !WX_TIMEZONE
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// debugging helper: just a convenient replacement of wxCHECK()
+#define wxDATETIME_CHECK(expr, msg) \
+ if ( !(expr) ) \
+ { \
+ wxFAIL_MSG(msg); \
+ *this = wxInvalidDateTime; \
+ return *this; \
+ }
+
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
// some trivial ones
static const int MONTHS_IN_YEAR = 12;
-static const int SECONDS_IN_MINUTE = 60;
+static const int SEC_PER_MIN = 60;
+
+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;
+
static const long MILLISECONDS_PER_DAY = 86400000l;
// this is the integral part of JDN of the midnight of Jan 1, 1970
// global data
// ----------------------------------------------------------------------------
-static wxDateTime gs_dtDefault;
+// 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;
-wxDateTime& wxDefaultDateTime = gs_dtDefault;
+const wxDateTime& wxDefaultDateTime = gs_dtDefault;
wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
{
// just call localtime() instead of figuring out whether this system
// supports tzset(), _tzset() or something else
- time_t t;
- (void)localtime(&t);
+ time_t t = 0;
+ (void)localtime(&t);
s_timezoneSet = TRUE;
}
// 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);
wxFAIL_MSG( _T("mktime() failed") );
- return wxInvalidDateTime;
+ *this = wxInvalidDateTime;
+
+ return *this;
}
else
{
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
- wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000,
- wxInvalidDateTime,
- _T("Invalid time in wxDateTime::Set()") );
+ wxDATETIME_CHECK( hour < 24 &&
+ second < 62 &&
+ minute < 60 &&
+ millisec < 1000,
+ _T("Invalid time in wxDateTime::Set()") );
// get the current date from system
struct tm *tm = GetTmNow();
- wxCHECK_MSG( tm, wxInvalidDateTime, _T("localtime() failed") );
+ wxDATETIME_CHECK( tm, _T("localtime() failed") );
// adjust the time
tm->tm_hour = hour;
wxDateTime_t second,
wxDateTime_t millisec)
{
- wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
-
- wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000,
- wxInvalidDateTime,
- _T("Invalid time in wxDateTime::Set()") );
+ wxDATETIME_CHECK( hour < 24 &&
+ second < 62 &&
+ minute < 60 &&
+ millisec < 1000,
+ _T("Invalid time in wxDateTime::Set()") );
ReplaceDefaultYearMonthWithCurrent(&year, &month);
- wxCHECK_MSG( (0 < day) && (day <= GetNumberOfDays(month, year)),
- wxInvalidDateTime,
- _T("Invalid date in wxDateTime::Set()") );
+ wxDATETIME_CHECK( (0 < day) && (day <= GetNumberOfDays(month, year)),
+ _T("Invalid date in wxDateTime::Set()") );
// the range of time_t type (inclusive)
static const int yearMinInRange = 1970;
else
{
time += (time_t)tz.GetOffset();
-#ifdef __VMS__ // time is unsigned so avoid warning
+#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
int time2 = (int) time;
if ( time2 >= 0 )
#else
// 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") );
// construct Tm from these values
Tm tm;
wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday)
{
- wxCHECK_MSG( weekday != Inv_WeekDay, wxInvalidDateTime, _T("invalid weekday") );
+ wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
WeekDay wdayThis = GetWeekDay();
if ( weekday == wdayThis )
wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
{
- wxCHECK_MSG( weekday != Inv_WeekDay, wxInvalidDateTime, _T("invalid weekday") );
+ wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
int diff;
WeekDay wdayThis = GetWeekDay();
wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
{
- wxCHECK_MSG( weekday != Inv_WeekDay, wxInvalidDateTime, _T("invalid weekday") );
+ wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
int diff;
WeekDay wdayThis = GetWeekDay();
wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
{
int year = GetYear();
- wxCHECK_MSG( (0 < yday) && (yday <= GetNumberOfDays(year)),
- wxInvalidDateTime, _T("invalid year day") );
+ wxDATETIME_CHECK( (0 < yday) && (yday <= GetNumberOfDays(year)),
+ _T("invalid year day") );
bool isLeap = IsLeapYear(year);
for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) )
{
time += (int)tz.GetOffset();
-#ifdef __VMS__ // time is unsigned so avoid the warning
+#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
int time2 = (int) time;
if ( time2 >= 0 )
#else
// take this date as default
tmDef = dateDef.GetTm();
}
-#ifdef __WIN16__
- else if ( m_time != 0 )
-#else
- else if ( m_time != wxLongLong(0) )
-#endif
+ else if ( IsValid() )
{
// if this date is valid, don't change it
tmDef = GetTm();
: 31;
// can it be day?
- if ( (val == 0) || (val > maxDays) )
+ if ( (val == 0) || (val > (unsigned long)maxDays) ) // cast to shut up compiler warning in BCC
{
isYear = TRUE;
}
// it's a month
if ( haveMon )
{
- break;
+ // 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
+ else // not a valid month name
{
wday = GetWeekDayFromName(token, Name_Full | Name_Abbr);
if ( wday != Inv_WeekDay )
haveWDay = TRUE;
}
- else
+ else // not a valid weekday name
{
// try the ordinals
static const wxChar *ordinals[] =
wxTRANSLATE("nineteenth"),
wxTRANSLATE("twentieth"),
// that's enough - otherwise we'd have problems with
- // composite (or not) ordinals otherwise
+ // composite (or not) ordinals
};
size_t n;
haveDay = TRUE;
- day = n + 1;
+ day = (wxDateTime_t)(n + 1);
}
}
}
mon = (wxDateTime::Month)(day - 1);
// we're in the current year then
- if ( year <= GetNumOfDaysInMonth(Inv_Year, mon) )
+ if ( (year > 0) &&
+ (unsigned)year <= GetNumOfDaysInMonth(Inv_Year, mon) )
{
day = year;
}
}
- // try all time formats we may think about starting with the standard one
- const wxChar *result = ParseFormat(time, _T("%X"));
+ // try all time formats we may think about in the order from longest to
+ // shortest
+
+ // 12hour with AM/PM?
+ const wxChar *result = ParseFormat(time, _T("%I:%M:%S %p"));
+
if ( !result )
{
// normally, it's the same, but why not try it?
if ( !result )
{
- // 12hour with AM/PM?
- result = ParseFormat(time, _T("%I:%M:%S %p"));
+ // 12hour with AM/PM but without seconds?
+ result = ParseFormat(time, _T("%I:%M %p"));
}
if ( !result )
if ( !result )
{
- // 12hour with AM/PM but without seconds?
- result = ParseFormat(time, _T("%I:%M %p"));
+ // just the hour and AM/PM?
+ result = ParseFormat(time, _T("%I %p"));
}
if ( !result )
if ( !result )
{
- // just the hour and AM/PM?
- result = ParseFormat(time, _T("%I %p"));
+ // parse the standard format: normally it is one of the formats above
+ // but it may be set to something completely different by the user
+ result = ParseFormat(time, _T("%X"));
}
// TODO: parse timezones
// wxTimeSpan
// ============================================================================
+// this enum is only used in wxTimeSpan::Format() below but we can't declare
+// it locally to the method as it provokes an internal compiler error in egcs
+// 2.91.60 when building with -O2
+enum TimeSpanPart
+{
+ Part_Week,
+ Part_Day,
+ Part_Hour,
+ Part_Min,
+ Part_Sec,
+ Part_MSec
+};
+
// not all strftime(3) format specifiers make sense here because, for example,
// a time span doesn't have a year nor a timezone
//
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
+ TimeSpanPart partBiggest = Part_MSec;
+
for ( const wxChar *pch = format; *pch; pch++ )
{
wxChar ch = *pch;
if ( ch == _T('%') )
{
- wxString tmp;
+ // 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 )
// fall through
case _T('%'):
- // will get to str << ch below
- break;
+ str += ch;
+
+ // skip the part below switch
+ continue;
case _T('D'):
- tmp.Printf(_T("%d"), GetDays());
+ n = GetDays();
+ if ( partBiggest < Part_Day )
+ {
+ n %= DAYS_PER_WEEK;
+ }
+ else
+ {
+ partBiggest = Part_Day;
+ }
break;
case _T('E'):
- tmp.Printf(_T("%d"), GetWeeks());
+ partBiggest = Part_Week;
+ n = GetWeeks();
break;
case _T('H'):
- tmp.Printf(_T("%02d"), GetHours());
+ n = GetHours();
+ if ( partBiggest < Part_Hour )
+ {
+ n %= HOURS_PER_DAY;
+ }
+ else
+ {
+ partBiggest = Part_Hour;
+ }
+
+ fmtPrefix += _T("02");
break;
case _T('l'):
- tmp.Printf(_T("%03ld"), GetMilliseconds().ToLong());
+ 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'):
- tmp.Printf(_T("%02d"), GetMinutes());
+ n = GetMinutes();
+ if ( partBiggest < Part_Min )
+ {
+ n %= MIN_PER_HOUR;
+ }
+ else
+ {
+ partBiggest = Part_Min;
+ }
+
+ fmtPrefix += _T("02");
break;
case _T('S'):
- tmp.Printf(_T("%02ld"), GetSeconds().ToLong());
+ n = GetSeconds().ToLong();
+ if ( partBiggest < Part_Sec )
+ {
+ n %= SEC_PER_MIN;
+ }
+ else
+ {
+ partBiggest = Part_Sec;
+ }
+
+ fmtPrefix += _T("02");
break;
}
- if ( !!tmp )
- {
- str += tmp;
-
- // skip str += ch below
- continue;
- }
+ str += wxString::Format(fmtPrefix + _T("ld"), n);
+ }
+ else
+ {
+ // normal character, just copy
+ str += ch;
}
-
- str += ch;
}
return str;
return holidays.GetCount();
}
-
+#endif // wxUSE_DATETIME
projects / wxWidgets.git / blobdiff