added wxUSE_VARIANT guards

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/variant.h b/include/wx/variant.h
index a618b1da5729177d3a3bb075b77cda55d910abfc..d6bd548ca7cf05e2670b3d518c5d379afb0418c6 100644 (file)
--- 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 711f5524451cbb618b889b357562b049bbbe1fe5..a06ac80606a55444bebed43929b21256e2571236 100644 (file)
--- 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