X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c27e2faf30e4f41bf2497e6bc046770d05065c6..dc683654a1af7f02ee87623a713a7147bcb6dd84:/src/common/datetime.cpp diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index c8f8b2aea5..caf8b036ce 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -77,6 +77,12 @@ #include +#ifdef __WINDOWS__ + #include "wx/msw/wrapwin.h" + #include + #include +#endif + #include "wx/datetime.h" #include "wx/stopwatch.h" // for wxGetLocalTimeMillis() @@ -120,7 +126,9 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter , wxFromStringCon #endif #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM) - #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) + #if defined(__WXPALMOS__) + #define WX_GMTOFF_IN_TM + #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) #define WX_TIMEZONE _timezone #elif defined(__MWERKS__) long wxmw_timezone = 28800; @@ -233,6 +241,9 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] = // global data // ---------------------------------------------------------------------------- +const wxChar * wxDefaultDateTimeFormat = wxT("%c"); +const wxChar * wxDefaultTimeSpanFormat = wxT("%H:%M:%S"); + // in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to // indicate an invalid wxDateTime object const wxDateTime wxDefaultDateTime; @@ -346,7 +357,7 @@ static long GetTruncatedJDN(wxDateTime::wxDateTime_t day, static wxString CallStrftime(const wxChar *format, const tm* tm) { wxChar buf[4096]; - if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) ) + if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) ) { // buffer is too small? wxFAIL_MSG(_T("strftime() failed")); @@ -500,7 +511,7 @@ static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *number) break; } - return !s.IsEmpty() && s.ToULong(number); + return !s.empty() && s.ToULong(number); } // scans all alphabetic characters and returns the resulting string @@ -536,14 +547,14 @@ wxDateTime::Tm::Tm(const struct tm& tm, const TimeZone& tz) : 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 @@ -559,7 +570,7 @@ void wxDateTime::Tm::ComputeWeekDay() // 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)((wxDateTime::WeekDay)(GetTruncatedJDN(mday, mon, year) + 2) % 7); } void wxDateTime::Tm::AddMonths(int monDiff) @@ -597,7 +608,7 @@ void wxDateTime::Tm::AddDays(int dayDiff) dayDiff += GetNumOfDaysInMonth(year, mon); } - mday += dayDiff; + mday = (wxDateTime::wxDateTime_t)( mday + dayDiff ); while ( mday > GetNumOfDaysInMonth(year, mon) ) { mday -= GetNumOfDaysInMonth(year, mon); @@ -800,8 +811,8 @@ wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(wxDateTime::Month month, wxString wxDateTime::GetMonthName(wxDateTime::Month month, wxDateTime::NameFlags flags) { - wxCHECK_MSG( month != Inv_Month, _T(""), _T("invalid month") ); - + wxCHECK_MSG( month != Inv_Month, wxEmptyString, _T("invalid month") ); +#ifndef __WXWINCE__ // 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) tm tm; @@ -809,14 +820,57 @@ wxString wxDateTime::GetMonthName(wxDateTime::Month month, tm.tm_mon = month; return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &tm); +#else + wxString ret; + switch(month) + { + case Jan: + ret = (flags == Name_Abbr ? wxT("Jan"): wxT("January")); + break; + case Feb: + ret = (flags == Name_Abbr ? wxT("Feb"): wxT("Febuary")); + break; + case Mar: + ret = (flags == Name_Abbr ? wxT("Mar"): wxT("March")); + break; + case Apr: + ret = (flags == Name_Abbr ? wxT("Apr"): wxT("April")); + break; + case May: + ret = (flags == Name_Abbr ? wxT("May"): wxT("May")); + break; + case Jun: + ret = (flags == Name_Abbr ? wxT("Jun"): wxT("June")); + break; + case Jul: + ret = (flags == Name_Abbr ? wxT("Jul"): wxT("July")); + break; + case Aug: + ret = (flags == Name_Abbr ? wxT("Aug"): wxT("August")); + break; + case Sep: + ret = (flags == Name_Abbr ? wxT("Sep"): wxT("September")); + break; + case Oct: + ret = (flags == Name_Abbr ? wxT("Oct"): wxT("October")); + break; + case Nov: + ret = (flags == Name_Abbr ? wxT("Nov"): wxT("November")); + break; + case Dec: + ret = (flags == Name_Abbr ? wxT("Dec"): wxT("December")); + break; + } + return ret; +#endif } /* static */ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday, wxDateTime::NameFlags flags) { - wxCHECK_MSG( wday != Inv_WeekDay, _T(""), _T("invalid weekday") ); - + wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, _T("invalid weekday") ); +#ifndef __WXWINCE__ // 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!) @@ -834,6 +888,35 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday, // ... and call strftime() return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm); +#else + wxString ret; + switch(wday) + { + case Sun: + ret = (flags == Name_Abbr ? wxT("Sun") : wxT("Sunday")); + break; + case Mon: + ret = (flags == Name_Abbr ? wxT("Mon") : wxT("Monday")); + break; + case Tue: + ret = (flags == Name_Abbr ? wxT("Tue") : wxT("Tuesday")); + break; + case Wed: + ret = (flags == Name_Abbr ? wxT("Wed") : wxT("Wednesday")); + break; + case Thu: + ret = (flags == Name_Abbr ? wxT("Thu") : wxT("Thursday")); + break; + case Fri: + ret = (flags == Name_Abbr ? wxT("Fri") : wxT("Friday")); + break; + case Sat: + ret = (flags == Name_Abbr ? wxT("Sat") : wxT("Saturday")); + break; + } + return ret; + +#endif } /* static */ @@ -876,7 +959,7 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm) 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 @@ -910,6 +993,9 @@ wxDateTime::Country wxDateTime::GetCountry() ms_country = USA; } } +#else + ms_country = USA; +#endif return ms_country; } @@ -1168,16 +1254,11 @@ wxDateTime& wxDateTime::Set(const struct tm& tm) // 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)( + GetTimeZone() + + tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN + + tm2.tm_min * SEC_PER_MIN + + tm2.tm_sec)); } wxFAIL_MSG( _T("mktime() failed") ); @@ -1210,12 +1291,21 @@ wxDateTime& wxDateTime::Set(wxDateTime_t hour, 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; + + // 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(*tm); + (void)Set(tm1); // and finally adjust milliseconds return SetMillisecond(millisec); @@ -1262,7 +1352,10 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day, (void)Set(tm); // and finally adjust milliseconds - return SetMillisecond(millisec); + if (IsValid()) + SetMillisecond(millisec); + + return *this; } else { @@ -1873,7 +1966,7 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday, static inline wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm) { - return gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday; + return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday); } wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const @@ -1941,7 +2034,7 @@ wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const } } - return week; + return (wxDateTime::wxDateTime_t)week; } wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags, @@ -1974,7 +2067,7 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday) // yday lies in December then 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; } @@ -2061,7 +2154,7 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST) wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const { - wxCHECK_MSG( format, _T(""), _T("NULL format in wxDateTime::Format") ); + wxCHECK_MSG( format, wxEmptyString, _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 @@ -2099,11 +2192,13 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const tm = (struct tm *)NULL; } } - +#ifndef __WXWINCE__ + //Windows CE doesn't support strftime or wcsftime, so we use the generic implementation if ( tm ) { return CallStrftime(format, tm); } +#endif //else: use generic code below } @@ -2182,6 +2277,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const case _T('c'): // locale default date and time representation case _T('x'): // locale default date representation +#ifndef __WXWINCE__ // // the problem: there is no way to know what do these format // specifications correspond to for the current locale. @@ -2311,6 +2407,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const res += str; } +#else + //Use "%m/%d/%y %H:%M:%S" format instead + res += wxString::Format(wxT("%02d/%02d/%04d %02d:%02d:%02d"), + tm.mon+1,tm.mday, tm.year, tm.hour, tm.min, tm.sec); +#endif break; case _T('d'): // day of a month (01-31) @@ -2347,7 +2448,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const break; case _T('p'): // AM or PM string +#ifndef __WXWINCE__ res += CallStrftime(_T("%p"), &tmTimeOnly); +#else + res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am"); +#endif break; case _T('S'): // second as a decimal number (00-61) @@ -2370,7 +2475,11 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const case _T('X'): // locale default time representation // just use strftime() to format the time for us +#ifndef __WXWINCE__ res += CallStrftime(_T("%X"), &tmTimeOnly); +#else + res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec); +#endif break; case _T('y'): // year without century (00-99) @@ -2382,7 +2491,9 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const break; case _T('Z'): // timezone name +#ifndef __WXWINCE__ res += CallStrftime(_T("%Z"), &tmTimeOnly); +#endif break; default: @@ -2394,7 +2505,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const fmt += *p; } - if ( !fmt.IsEmpty() ) + if ( !fmt.empty() ) { // we've only got the flags and width so far in fmt fmt.Prepend(_T('%')); @@ -2467,11 +2578,11 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return (wxChar *)NULL; } - wxDateTime_t day = *p++ - _T('0'); + wxDateTime_t day = (wxDateTime_t)(*p++ - _T('0')); if ( wxIsdigit(*p) ) { day *= 10; - day += *p++ - _T('0'); + day = (wxDateTime_t)(day + (*p++ - _T('0'))); } if ( *p++ != _T(' ') ) @@ -2565,7 +2676,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return (wxChar *)NULL; } - wxDateTime_t hour = *p++ - _T('0'); + wxDateTime_t hour = (wxDateTime_t)(*p++ - _T('0')); if ( !wxIsdigit(*p) ) { @@ -2573,7 +2684,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } hour *= 10; - hour += *p++ - _T('0'); + hour = (wxDateTime_t)(hour + (*p++ - _T('0'))); if ( *p++ != _T(':') ) { @@ -2585,7 +2696,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return (wxChar *)NULL; } - wxDateTime_t min = *p++ - _T('0'); + wxDateTime_t min = (wxDateTime_t)(*p++ - _T('0')); if ( !wxIsdigit(*p) ) { @@ -2593,7 +2704,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } min *= 10; - min += *p++ - _T('0'); + min = (wxDateTime_t)(min + *p++ - _T('0')); wxDateTime_t sec = 0; if ( *p++ == _T(':') ) @@ -2603,7 +2714,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return (wxChar *)NULL; } - sec = *p++ - _T('0'); + sec = (wxDateTime_t)(*p++ - _T('0')); if ( !wxIsdigit(*p) ) { @@ -2611,7 +2722,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } sec *= 10; - sec += *p++ - _T('0'); + sec = (wxDateTime_t)(sec + *p++ - _T('0')); } if ( *p++ != _T(' ') ) @@ -2722,6 +2833,60 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return p; } +#ifdef __WINDOWS__ +// Get's current locale's date formatting string and stores it in fmt if +// the locale is set; otherwise or in case of failure, leaves fmt unchanged +void GetLocaleDateFormat(wxString *fmt) +{ + if ( strcmp(setlocale(LC_ALL, NULL), "C") != 0 ) + { + // The locale was programatically set to non-C. We assume that this was + // done using wxLocale, in which case thread's current locale is also + // set to correct LCID value and we can use GetLocaleInfo to determine + // the correct formatting string: + LCID lcid = GetThreadLocale(); + wxChar delim[5]; // fields deliminer, 4 chars max + if ( GetLocaleInfo(lcid, LOCALE_SDATE, delim, 5) ) + { + wxChar centurybuf[2]; // use %y or %Y, 1 char max + wxChar century = 'y'; + if ( GetLocaleInfo(lcid, LOCALE_ICENTURY, centurybuf, 2) ) + { + if ( centurybuf[0] == _T('1') ) + century = 'Y'; + // else 'y' as above + } + + wxChar order[2]; // order code, 1 char max + if ( GetLocaleInfo(lcid, LOCALE_IDATE, order, 2) ) + { + if ( order[0] == _T('0') ) // M-D-Y + { + *fmt = wxString::Format(_T("%%m%s%%d%s%%%c"), + delim, delim, century); + } + else if ( order[0] == _T('1') ) // D-M-Y + { + *fmt = wxString::Format(_T("%%d%s%%m%s%%%c"), + delim, delim, century); + } + else if ( order[0] == _T('2') ) // Y-M-D + { + *fmt = wxString::Format(_T("%%%c%s%%m%s%%d"), + century, delim, delim); + } + else + { + wxFAIL_MSG(_T("unexpected GetLocaleInfo return value")); + } + } + } + // if we failed, leave fmtDate value unchanged and + // try our luck with the default set above + } +} +#endif // __WINDOWS__ + const wxChar *wxDateTime::ParseFormat(const wxChar *date, const wxChar *format, const wxDateTime& dateDef) @@ -2966,7 +3131,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, wxString am, pm, token = GetAlphaToken(input); GetAmPmStrings(&am, &pm); - if (am.IsEmpty() && pm.IsEmpty()) + if (am.empty() && pm.empty()) return (wxChar *)NULL; // no am/pm strings defined if ( token.CmpNoCase(pm) == 0 ) { @@ -3081,11 +3246,11 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, } #endif // HAVE_STRPTIME - // TODO query the LOCALE_IDATE setting under Win32 { wxDateTime dt; wxString fmtDate, fmtDateAlt; + if ( IsWestEuropeanCountry(GetCountry()) || GetCountry() == Russia ) { @@ -3098,6 +3263,12 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, fmtDateAlt = _T("%d/%m/%y"); } +#ifdef __WINDOWS__ + // The above doesn't work for all locales, try to query + // Windows for the right way of formatting the date: + GetLocaleDateFormat(&fmtDate); +#endif + const wxChar *result = dt.ParseFormat(input, fmtDate); if ( !result ) @@ -3392,19 +3563,23 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) { wxString date = wxGetTranslation(literalDates[n].str); size_t len = date.length(); - if ( wxStrlen(p) >= len && (wxString(p, len).CmpNoCase(date) == 0) ) + if ( wxStrlen(p) >= len ) { - // nothing can follow this, so stop here - p += len; - - int dayDiffFromToday = literalDates[n].dayDiffFromToday; - *this = Today(); - if ( dayDiffFromToday ) + wxString str(p, len); + if ( str.CmpNoCase(date) == 0 ) { - *this += wxDateSpan::Days(dayDiffFromToday); - } + // nothing can follow this, so stop here + p += len; - return p; + int dayDiffFromToday = literalDates[n].dayDiffFromToday; + *this = Today(); + if ( dayDiffFromToday ) + { + *this += wxDateSpan::Days(dayDiffFromToday); + } + + return p; + } } } @@ -3459,12 +3634,14 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) } else // may be either day or year { - wxDateTime_t maxDays = haveMon + wxDateTime_t max_days = (wxDateTime_t)( + haveMon ? GetNumOfDaysInMonth(haveYear ? year : Inv_Year, mon) - : 31; + : 31 + ); // can it be day? - if ( (val == 0) || (val > (unsigned long)maxDays) ) + if ( (val == 0) || (val > (unsigned long)max_days) ) { // no isYear = true; @@ -3515,7 +3692,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) { // 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; + day = (wxDateTime_t)(mon + 1); haveDay = true; } else @@ -3637,7 +3814,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) // we're in the current year then if ( (year > 0) && (year <= (int)GetNumOfDaysInMonth(Inv_Year, mon)) ) { - day = year; + day = (wxDateTime_t)year; haveMon = true; haveYear = false; @@ -3786,10 +3963,25 @@ bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const return !wxDateTimeHolidayAuthority::IsHoliday(*this); } +// ============================================================================ +// wxDateSpan +// ============================================================================ + +wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds) +{ + wxDateSpan ds1(ds); + return ds1.Multiply(n); +} + // ============================================================================ // wxTimeSpan // ============================================================================ +wxTimeSpan WXDLLIMPEXP_BASE operator*(int n, const wxTimeSpan& ts) +{ + return wxTimeSpan(ts).Multiply(n); +} + // 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 @@ -3821,7 +4013,7 @@ enum TimeSpanPart // %l milliseconds (000 - 999) wxString wxTimeSpan::Format(const wxChar *format) const { - wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") ); + wxCHECK_MSG( format, wxEmptyString, _T("NULL format in wxTimeSpan::Format") ); wxString str; str.Alloc(wxStrlen(format)); @@ -4026,7 +4218,7 @@ void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth) wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority() { - // nothing to do here + // required here for Darwin } // ---------------------------------------------------------------------------- @@ -4074,4 +4266,46 @@ size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart, 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, _T("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, _T("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, _T("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, _T("invalid week day") ); + + wd = wd == wxDateTime::Sun ? wxDateTime::Inv_WeekDay + : (wxDateTime::WeekDay)(wd - 1); +} + #endif // wxUSE_DATETIME