X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7b51bc869213608fdad75c28fba1f245d43549f..acf8e3d29e897ade2087e3d9048e5c448823d391:/include/wx/datetime.inl diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl index 8ec379dd9d..7b9360ffb0 100644 --- a/include/wx/datetime.inl +++ b/include/wx/datetime.inl @@ -36,7 +36,9 @@ // ---------------------------------------------------------------------------- // only define this once, when included from datetime.cpp -#ifdef wxDEFINE_TIME_CONSTANTS +// TODO: figure out why switching accessibility on causes link errors +// if don't use this test. +#if defined(wxDEFINE_TIME_CONSTANTS) || (defined(_MSC_VER) && wxUSE_ACCESSIBILITY) const long wxDateTime::TIME_T_FACTOR = 1000l; #endif // wxDEFINE_TIME_CONSTANTS @@ -156,7 +158,8 @@ inline bool wxDateTime::SetToLastWeekDay(WeekDay weekday, return SetToWeekDay(weekday, -1, month, year); } -inline wxDateTime wxDateTime::GetWeekDayInSameWeek(WeekDay weekday) const +inline wxDateTime wxDateTime::GetWeekDayInSameWeek(WeekDay weekday, + WeekFlags flags) const { MODIFY_AND_RETURN( SetToWeekDayInSameWeek(weekday) ); } @@ -191,11 +194,12 @@ inline wxDateTime wxDateTime::GetLastWeekDay(WeekDay weekday, } inline wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek, - WeekDay weekday) const + WeekDay weekday, + WeekFlags flags) const { wxDateTime dt(*this); - return dt.SetToTheWeek(numWeek, weekday) ? dt : wxInvalidDateTime; + return dt.SetToTheWeek(numWeek, weekday, flags) ? dt : wxInvalidDateTime; } inline wxDateTime wxDateTime::GetLastMonthDay(Month month, int year) const