move wxBitmapComboBox dependency check to wx/chkconf.h where it belongs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-24 13:18:23 +00:00
parent ca5c6ac3f4
commit 8d37334f0e
3 changed files with 20 additions and 20 deletions

View File

@@ -316,6 +316,14 @@
# endif
#endif /* !defined(wxUSE_ACCEL) */
#ifndef wxUSE_BITMAPCOMBOBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_BITMAPCOMBOBOX must be defined."
# else
# define wxUSE_BITMAPCOMBOBOX 0
# endif
#endif /* !defined(wxUSE_BITMAPCOMBOBOX) */
#ifndef wxUSE_BMPBUTTON
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_BMPBUTTON must be defined."
@@ -1202,6 +1210,15 @@
# endif
#endif /* wxUSE_CHOICEBOOK */
#if !wxUSE_ODCOMBOBOX
# if wxUSE_BITMAPCOMBOBOX
# error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
# else
# undef wxUSE_BITMAPCOMBOBOX
# define wxUSE_BITMAPCOMBOBOX 0
# endif
#endif /* !wxUSE_ODCOMBOBOX */
/* don't attempt to use native status bar on the platforms not having it */
#ifndef wxUSE_NATIVE_STATUSBAR
# define wxUSE_NATIVE_STATUSBAR 0