From: Julian Smart Date: Fri, 11 Apr 2003 11:01:39 +0000 (+0000) Subject: Moved wxDateTime::TIME_T_FACTOR into datetime.cpp to X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bd4a25bc50eeac208fb0cfbbc21a88126d653209 Moved wxDateTime::TIME_T_FACTOR into datetime.cpp to prevent VC++ confusion git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl index 7b9360ffb0..20bcf4c58a 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; diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index d796e6e127..45a15e0c88 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -82,6 +82,8 @@ #include "wx/datetime.h" #include "wx/timer.h" // for wxGetLocalTimeMillis() +const long wxDateTime::TIME_T_FACTOR = 1000l; + // ---------------------------------------------------------------------------- // conditional compilation // ----------------------------------------------------------------------------