From 6589f1a49aa258f25f4f06cefd7dadb3097bcdee Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Tue, 15 Jun 2010 13:34:01 +0000 Subject: [PATCH] Fix compilation when wxAny was disabled (fixes #12148) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/variant.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 1820f4b8d5..f5a417ce37 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -270,18 +270,20 @@ public: virtual wxString GetType() const { return wxT("long"); } +#if wxUSE_ANY // Since wxAny does not have separate type for integers shorter than // longlong, we do not usually implement wxVariant->wxAny conversion // here (but in wxVariantDataLongLong instead). -#ifndef wxLongLong_t + #ifndef wxLongLong_t DECLARE_WXANY_CONVERSION() -#else + #else bool GetAsAny(wxAny* any) const { *any = m_value; return true; } -#endif + #endif +#endif // wxUSE_ANY protected: long m_value; -- 2.45.2