Temporary fix for strange wxDateTime link error with VC++ and wxUSE_ACCESSIBILITY=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
21342bba68
commit
9dc8c75994
@ -36,7 +36,7 @@ class WXDLLEXPORT wxDateSpan;
|
||||
// rebuilt)
|
||||
|
||||
// For Mingw32, causes a link error. (VZ: why?)
|
||||
#if defined( __WXDEBUG__) && !defined(__MINGW32__) /* && !defined(_MSC_VER) */
|
||||
#if defined( __WXDEBUG__) && !defined(__MINGW32__) && !(defined(_MSC_VER) && wxUSE_ACCESSIBILITY)
|
||||
#define wxDATETIME_DONT_INLINE
|
||||
|
||||
#undef inline
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user