Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxUSE_VARIANT and the related checks, also added wxUSE_OLE_AUTOMATION

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2006-09-24 13:12:56 +00:00
parent 19883268f1
commit ca5c6ac3f4
19 changed files with 590 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/msw/chkconf.h
View File

@@ -219,6 +219,18 @@
# endif
#endif /* !defined(wxUSE_DIALUP_MANAGER) */
/* check settings consistency for MSW-specific ones */
#if !wxUSE_VARIANT
# if wxUSE_OLE_AUTOMATION
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxAutomationObject requires wxVariant"
# else
# undef wxUSE_OLE_AUTOMATION
# define wxUSE_OLE_AUTOMATION 0
# endif
# endif
#endif /* wxUSE_VARIANT */
#if !wxUSE_DYNAMIC_LOADER
# if wxUSE_MS_HTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
@@ -274,6 +286,15 @@
# define wxUSE_DATAOBJ 0
# endif
# endif
# if wxUSE_OLE_AUTOMATION
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxAutomationObject requires wxUSE_OLE"
# else
# undef wxUSE_OLE_AUTOMATION
# define wxUSE_OLE_AUTOMATION 0
# endif
# endif
#endif /* wxUSE_OLE */
#endif /* _WX_MSW_CHKCONF_H_ */