From 730dfeb496e9a76e8bd22c67a88a31a325315639 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 21 Jan 2003 23:28:07 +0000 Subject: [PATCH] patch 672127: Adds required check for wxUSE_WXHTML_HELP to chkconf.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/chkconf.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 6ce050c80f..c519fea476 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -12,10 +12,10 @@ /* 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 (default, recommended) or give an error and abort (mainly useful for - developpers only) + developers only) */ #define wxABORT_ON_CONFIG_ERROR @@ -1061,7 +1061,7 @@ #endif /* wxUSE_RADIOBTN */ #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 # error "Built in help controller can't be compiled" # else @@ -1071,6 +1071,8 @@ # define wxUSE_HTML 1 # undef wxUSE_COMBOBOX # define wxUSE_COMBOBOX 1 +# undef wxUSE_NOTEBOOK +# define wxUSE_NOTEBOOK 1 # endif # endif #endif /* wxUSE_WXHTML_HELP */ -- 2.45.2