define wxUSE_BOOKCTRL when wxUSE_NOTE/LIST/CHOICEBOOK are 0; also define it as as...

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ba91775a20eea0e48d08893469cba7b6934c3fb8..99189e57547f649d40923f0b82fcb377074ed526 100644 (file)
--- 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