From 9dc8c75994524ed89a660e9d2c01333572be0245 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 19 Feb 2003 21:06:52 +0000 Subject: [PATCH] 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 --- include/wx/datetime.h | 2 +- include/wx/datetime.inl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 27c40ec7bd..1794c796a6 100644 --- 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 398b02828b..7b9360ffb0 100644 --- 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 -- 2.45.2