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

diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 27c40ec7bd8e84565bfbb874137d126413c117ed..1794c796a646a13cdfd3b5179b19a08ce1447343 100644 (file)
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -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

diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 398b02828b0e3841d5b3343aa71bc50cfb62c2dc..7b9360ffb0b9e85ed3c9ec772c2da73294596f41 100644 (file)
--- 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