Added wxUSE_VARIANT and the related checks, also added wxUSE_OLE_AUTOMATION

to guard wxAutomationObject code which depends on wxVariant


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

include/wx/msw/ole/oleutils.h

@@ -228,11 +228,13 @@ private:
     OLECHAR *m_wzBuf;     // actual string
 };
 
+#if wxUSE_VARIANT
 // Convert variants
 class WXDLLIMPEXP_BASE wxVariant;
 
 WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
 WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
+#endif // wxUSE_VARIANT
 
 // Convert string to Unicode
 WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str);