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

patch 672127: Adds required check for wxUSE_WXHTML_HELP to chkconf.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-01-21 23:28:07 +00:00
parent 9e300531e5
commit 730dfeb496
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/chkconf.h
View File

@@ -12,10 +12,10 @@
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
/* /*
this global setting determintes what should we do if the setting FOO this global setting determines what should we do if the setting FOO
requires BAR and BAR is not set: we can either silently define BAR requires BAR and BAR is not set: we can either silently define BAR
(default, recommended) or give an error and abort (mainly useful for (default, recommended) or give an error and abort (mainly useful for
developpers only) developers only)
*/ */
#define wxABORT_ON_CONFIG_ERROR #define wxABORT_ON_CONFIG_ERROR
@@ -1061,7 +1061,7 @@
#endif /* wxUSE_RADIOBTN */ #endif /* wxUSE_RADIOBTN */
#if wxUSE_WXHTML_HELP #if wxUSE_WXHTML_HELP
# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX # if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "Built in help controller can't be compiled" # error "Built in help controller can't be compiled"
# else # else
@@ -1071,6 +1071,8 @@
# define wxUSE_HTML 1 # define wxUSE_HTML 1
# undef wxUSE_COMBOBOX # undef wxUSE_COMBOBOX
# define wxUSE_COMBOBOX 1 # define wxUSE_COMBOBOX 1
# undef wxUSE_NOTEBOOK
# define wxUSE_NOTEBOOK 1
# endif # endif
# endif # endif
#endif /* wxUSE_WXHTML_HELP */ #endif /* wxUSE_WXHTML_HELP */