From aa017eabe201ae64903d9267251679274c305e1a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 28 Sep 2006 13:48:55 +0000 Subject: [PATCH] define wxUSE_BOOKCTRL when wxUSE_NOTE/LIST/CHOICEBOOK are 0; also define it as as 1 if wxUSE_TREEBOOK==1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/chkconf.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index ba91775a20..99189e5754 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -1174,19 +1174,22 @@ # endif #endif /* wxUSE_BMPBUTTON */ -#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK || wxUSE_CHOICEBOOK -# if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BOOKCTRL must be set." -# else -# undef wxUSE_BOOKCTRL -# endif +/* + wxUSE_BOOKCTRL should be only used if any of the controls deriving from it + are used + */ +#ifdef wxUSE_BOOKCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_BOOKCTRL is defined automatically, don't define it" +# else +# undef wxUSE_BOOKCTRL # endif +#endif -# ifndef wxUSE_BOOKCTRL -# define wxUSE_BOOKCTRL 1 -# endif -#endif /* wxUSE_NOTEBOOK */ +#define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \ + wxUSE_LISTBOOK || \ + wxUSE_CHOICEBOOK || \ + wxUSE_TREEBOOK) #if wxUSE_LISTBOOK # if !wxUSE_LISTCTRL -- 2.45.2