check for wxUSE_REARRANGECTRL dependency on wxUSE_CHECKLISTBOX (see #10331)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -635,14 +635,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* !defined(wxUSE_HELP) */
|
#endif /* !defined(wxUSE_HELP) */
|
||||||
|
|
||||||
#ifndef wxUSE_HEADERCTRL
|
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
|
||||||
# error "wxUSE_HEADERCTRL must be defined."
|
|
||||||
# else
|
|
||||||
# define wxUSE_HEADERCTRL 0
|
|
||||||
# endif
|
|
||||||
#endif /* !defined(wxUSE_HEADERCTRL) */
|
|
||||||
|
|
||||||
#ifndef wxUSE_HYPERLINKCTRL
|
#ifndef wxUSE_HYPERLINKCTRL
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
# error "wxUSE_HYPERLINKCTRL must be defined."
|
# error "wxUSE_HYPERLINKCTRL must be defined."
|
||||||
@@ -1445,6 +1437,17 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* !wxUSE_HEADERCTRL */
|
#endif /* !wxUSE_HEADERCTRL */
|
||||||
|
|
||||||
|
#if wxUSE_REARRANGECTRL
|
||||||
|
# if !wxUSE_CHECKLISTBOX
|
||||||
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
# error "wxRearrangeCtrl requires wxCheckListBox"
|
||||||
|
# else
|
||||||
|
# undef wxUSE_REARRANGECTRL
|
||||||
|
# define wxUSE_REARRANGECTRL 0
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif /* wxUSE_REARRANGECTRL */
|
||||||
|
|
||||||
/* don't attempt to use native status bar on the platforms not having it */
|
/* don't attempt to use native status bar on the platforms not having it */
|
||||||
#ifndef wxUSE_NATIVE_STATUSBAR
|
#ifndef wxUSE_NATIVE_STATUSBAR
|
||||||
# define wxUSE_NATIVE_STATUSBAR 0
|
# define wxUSE_NATIVE_STATUSBAR 0
|
||||||
|
Reference in New Issue
Block a user