// so long as the above copyright and this permission statement
// are retained in all copies.
//
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
/*
#undef HAVE_STRPTIME
#endif // broken strptime()
-#ifndef WX_TIMEZONE
+#if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
#if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
#define WX_TIMEZONE _timezone
#elif defined(__MWERKS__)
long wxmw_timezone = 28800;
#define WX_TIMEZONE wxmw_timezone
- #elif defined(__DJGPP__)
+ #elif defined(__DJGPP__) || defined(__WINE__)
#include <sys/timeb.h>
#include <values.h>
static long wxGetTimeZone()
return timezone;
}
#define WX_TIMEZONE wxGetTimeZone()
+ #elif defined(__DARWIN__)
+ #define WX_GMTOFF_IN_TM
#else // unknown platform - try timezone
#define WX_TIMEZONE timezone
#endif
-#endif // !WX_TIMEZONE
+#endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM
// ----------------------------------------------------------------------------
// macros
return daysInMonth[wxDateTime::IsLeapYear(year)][month];
}
-// ensure that the timezone variable is set by calling localtime
+// returns the time zone in the C sense, i.e. the difference UTC - local
+// (in seconds)
static int GetTimeZone()
{
// set to TRUE when the timezone is set
static bool s_timezoneSet = FALSE;
+#ifdef WX_GMTOFF_IN_TM
+ static long gmtoffset = LONG_MAX; // invalid timezone
+#endif
wxCRIT_SECT_LOCKER(lock, gs_critsectTimezone);
+ // ensure that the timezone variable is set by calling localtime
if ( !s_timezoneSet )
{
// just call localtime() instead of figuring out whether this system
// supports tzset(), _tzset() or something else
- time_t t = 0;
+ time_t t = 0;
+ struct tm *tm;
- (void)localtime(&t);
+ tm = localtime(&t);
s_timezoneSet = TRUE;
+
+#ifdef WX_GMTOFF_IN_TM
+ // note that GMT offset is the opposite of time zone and so to return
+ // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
+ // cases we have to negate it
+ gmtoffset = -tm->tm_gmtoff;
+#endif
}
+#ifdef WX_GMTOFF_IN_TM
+ return (int)gmtoffset;
+#else
return (int)WX_TIMEZONE;
+#endif
}
// return the integral part of the JDN for the midnight of the given date (to
return *this;
}
+// ----------------------------------------------------------------------------
+// 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;
+
+ 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 *tm = localtime(&ticks);
+
+ 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
// ----------------------------------------------------------------------------
// Weekday and monthday stuff
// ----------------------------------------------------------------------------
-bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek, WeekDay weekday)
+bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
+ WeekDay weekday,
+ WeekFlags flags)
{
+ wxASSERT_MSG( numWeek > 0,
+ _T("invalid week number: weeks are counted from 1") );
+
int year = GetYear();
// Jan 4 always lies in the 1st week of the year
Set(4, Jan, year);
- SetToWeekDayInSameWeek(weekday) += wxDateSpan::Weeks(numWeek);
+ SetToWeekDayInSameWeek(weekday, flags) += wxDateSpan::Weeks(numWeek - 1);
if ( GetYear() != 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") );
- WeekDay wdayThis = GetWeekDay();
+ int wdayThis = GetWeekDay();
if ( weekday == 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;
+ }
+ //else: Sunday_First, nothing to do
+
+ // go forward or back in time to the day we want
+ if ( weekday < wdayThis )
{
return Subtract(wxDateSpan::Days(wdayThis - weekday));
}
fmt = _T("%03d");
break;
+ case _T('w'): // week day as number has only one
+ fmt = _T("%d");
+ break;
+
default:
// it's either another valid format specifier in which case
// the format is "%02d" (for all the rest) or we have the
width += *fmt - _T('0');
}
+ // the default widths for the various fields
+ if ( !width )
+ {
+ switch ( *fmt )
+ {
+ case _T('Y'): // year has 4 digits
+ width = 4;
+ break;
+
+ case _T('j'): // day of year has 3 digits
+ case _T('l'): // milliseconds have 3 digits
+ width = 3;
+ break;
+
+ case _T('w'): // week day as number has only one
+ width = 1;
+ break;
+
+ default:
+ // default for all other fields
+ width = 2;
+ }
+ }
+
// then the format itself
switch ( *fmt )
{
// tokenize the string
size_t nPosCur = 0;
- static const wxChar *dateDelimiters = _T(".,/-\t\n ");
+ static const wxChar *dateDelimiters = _T(".,/-\t\r\n ");
wxStringTokenizer tok(p, dateDelimiters);
while ( tok.HasMoreTokens() )
{
projects / wxWidgets.git / blobdiff