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
This commit is contained in:
parent
8ddb1b8a88
commit
aa017eabe2
@ -1174,19 +1174,22 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* wxUSE_BMPBUTTON */
|
#endif /* wxUSE_BMPBUTTON */
|
||||||
|
|
||||||
#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK || wxUSE_CHOICEBOOK
|
/*
|
||||||
# if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
|
wxUSE_BOOKCTRL should be only used if any of the controls deriving from it
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
are used
|
||||||
# error "wxUSE_BOOKCTRL must be set."
|
*/
|
||||||
# else
|
#ifdef wxUSE_BOOKCTRL
|
||||||
# undef wxUSE_BOOKCTRL
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
# endif
|
# error "wxUSE_BOOKCTRL is defined automatically, don't define it"
|
||||||
|
# else
|
||||||
|
# undef wxUSE_BOOKCTRL
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
# ifndef wxUSE_BOOKCTRL
|
#define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
|
||||||
# define wxUSE_BOOKCTRL 1
|
wxUSE_LISTBOOK || \
|
||||||
# endif
|
wxUSE_CHOICEBOOK || \
|
||||||
#endif /* wxUSE_NOTEBOOK */
|
wxUSE_TREEBOOK)
|
||||||
|
|
||||||
#if wxUSE_LISTBOOK
|
#if wxUSE_LISTBOOK
|
||||||
# if !wxUSE_LISTCTRL
|
# if !wxUSE_LISTCTRL
|
||||||
|
Loading…
Reference in New Issue
Block a user