test that wxUSE_OWNERDRAWNCOMBOBOX and wxUSE_COMBOCONTROL are defined

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ae7b45c4e5f1e5b23ebc099e2e32790d94bef912..2efc1eea21561292d59a5cd67c0e3b77f2293d37 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -388,6 +388,14 @@
 #   endif
 #endif /* !defined(wxUSE_COMBOBOX) */
 
 #   endif
 #endif /* !defined(wxUSE_COMBOBOX) */
 

+#ifndef wxUSE_COMBOCONTROL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_COMBOCONTROL must be defined."
+#   else
+#       define wxUSE_COMBOCONTROL 0
+#   endif
+#endif /* !defined(wxUSE_COMBOBOX) */
+

 #ifndef wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DATAOBJ must be defined."
 #ifndef wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DATAOBJ must be defined."


@@ -617,6 +625,14 @@
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 

+#ifndef wxUSE_OWNERDRAWNCOMBOBOX
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_OWNERDRAWNCOMBOBOX must be defined."
+#   else
+#       define wxUSE_OWNERDRAWNCOMBOBOX 0
+#   endif
+#endif /* !defined(wxUSE_COMBOBOX) */
+

 #ifndef wxUSE_PALETTE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PALETTE must be defined."
 #ifndef wxUSE_PALETTE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PALETTE must be defined."