From d5dc103fd4afb197f48d6a87f67f6b82dd7f56fe Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 25 Sep 2006 12:55:25 +0000 Subject: [PATCH] added wxUSE_VARIANT guards git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/variant.h | 8 ++++++-- src/common/variant.cpp | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/wx/variant.h b/include/wx/variant.h index a618b1da57..d6bd548ca7 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -13,6 +13,9 @@ #define _WX_VARIANT_H_ #include "wx/defs.h" + +#if wxUSE_VARIANT + #include "wx/object.h" #include "wx/string.h" #include "wx/arrstr.h" @@ -278,5 +281,6 @@ protected: extern wxVariant WXDLLIMPEXP_BASE wxNullVariant; -#endif - // _WX_VARIANT_H_ +#endif // wxUSE_VARIANT + +#endif // _WX_VARIANT_H_ diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 711f552445..a06ac80606 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -18,6 +18,8 @@ #include "wx/variant.h" +#if wxUSE_VARIANT + #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/math.h" @@ -2103,3 +2105,5 @@ bool wxVariant::Convert(wxDateTime* value) const (value->ParseDateTime(val) || value->ParseDate(val) || value->ParseTime(val)); } #endif // wxUSE_DATETIME + +#endif // wxUSE_VARIANT -- 2.50.0