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
This commit is contained in:
@@ -35,13 +35,6 @@
|
|||||||
// wxDateTime construction
|
// 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
|
inline bool wxDateTime::IsInStdRange() const
|
||||||
{
|
{
|
||||||
return m_time >= 0l && (m_time / TIME_T_FACTOR) < LONG_MAX;
|
return m_time >= 0l && (m_time / TIME_T_FACTOR) < LONG_MAX;
|
||||||
|
@@ -82,6 +82,8 @@
|
|||||||
#include "wx/datetime.h"
|
#include "wx/datetime.h"
|
||||||
#include "wx/timer.h" // for wxGetLocalTimeMillis()
|
#include "wx/timer.h" // for wxGetLocalTimeMillis()
|
||||||
|
|
||||||
|
const long wxDateTime::TIME_T_FACTOR = 1000l;
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// conditional compilation
|
// conditional compilation
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user