From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 29 Jul 2006 20:31:41 +0000 (+0000)
Subject: wxUSE_DATAOBJ requires wxUSE_OLE (bug 1526189)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/42ef5bda0ed5812292585b773add5124177f2e41

wxUSE_DATAOBJ requires wxUSE_OLE (bug 1526189)


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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index a381c045aa..28897ab050 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -265,4 +265,15 @@
 #   endif
 #endif  /* wxUSE_DYNLIB_CLASS */
 
+#if !wxUSE_OLE
+#   if wxUSE_DATAOBJ
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_DATAOBJ requires wxUSE_OLE"
+#       else
+#           undef wxUSE_DATAOBJ
+#           define wxUSE_DATAOBJ 0
+#       endif
+#   endif
+#endif /* wxUSE_OLE */
+
 #endif /* _WX_MSW_CHKCONF_H_ */