X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dc8c75994524ed89a660e9d2c01333572be0245..11c5b47d9454915aa790ded6cf03613b9e2df12c:/include/wx/datetime.inl?ds=sidebyside diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl index 7b9360ffb0..546de23f8a 100644 --- a/include/wx/datetime.inl +++ b/include/wx/datetime.inl @@ -35,13 +35,6 @@ // wxDateTime construction // ---------------------------------------------------------------------------- -// only define this once, when included from datetime.cpp -// 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 - inline bool wxDateTime::IsInStdRange() const { return m_time >= 0l && (m_time / TIME_T_FACTOR) < LONG_MAX; @@ -107,7 +100,8 @@ inline wxDateTime& wxDateTime::Set(const Tm& tm) { wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") ); - return Set(tm.mday, (Month)tm.mon, tm.year, tm.hour, tm.min, tm.sec); + return Set(tm.mday, (Month)tm.mon, tm.year, + tm.hour, tm.min, tm.sec, tm.msec); } inline wxDateTime::wxDateTime(wxDateTime_t hour,