diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ae7b45c4e5..2efc1eea21 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -388,6 +388,14 @@
 #   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."
@@ -617,6 +625,14 @@
 #   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."