remove unneeded includes from mac/carbon/private.h

[wxWidgets.git] / include / wx / chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 2efc1eea21561292d59a5cd67c0e3b77f2293d37..6c9729b5fb91006ceffe8aee920c624aac8cac89 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -71,6 +71,8 @@
 
 /*
    tests for non GUI features
+
+   please keep the options in alphabetical order!
  */
 
 #ifndef wxUSE_CRASHREPORT
@@ -276,6 +278,8 @@
 
 /*
    all these tests are for GUI only
+
+   please keep the options in alphabetical order!
  */
 #if wxUSE_GUI
 
@@ -388,13 +392,13 @@
 #   endif
 #endif /* !defined(wxUSE_COMBOBOX) */
 
-#ifndef wxUSE_COMBOCONTROL
+#ifndef wxUSE_COMBOCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_COMBOCONTROL must be defined."
+#       error "wxUSE_COMBOCTRL must be defined."
 #   else
-#       define wxUSE_COMBOCONTROL 0
+#       define wxUSE_COMBOCTRL 0
 #   endif
-#endif /* !defined(wxUSE_COMBOBOX) */
+#endif /* !defined(wxUSE_COMBOCTRL) */
 
 #ifndef wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
@@ -404,6 +408,14 @@
 #   endif
 #endif /* !defined(wxUSE_DATAOBJ) */
 
+#ifndef wxUSE_DATAVIEWCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DATAVIEWCTRL must be defined."
+#   else
+#       define wxUSE_DATAVIEWCTRL 0
+#   endif
+#endif /* !defined(wxUSE_DATAVIEWCTRL) */
+
 #ifndef wxUSE_DATEPICKCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DATEPICKCTRL must be defined."
@@ -484,14 +496,6 @@
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
-#ifndef wxUSE_XRC
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_XRC must be defined."
-#   else
-#       define wxUSE_XRC 0
-#   endif
-#endif /* !defined(wxUSE_XRC) */
-
 #ifndef wxUSE_LIBMSPACK
 #   ifndef __UNIX__
         /* set to 0 on platforms that don't have libmspack */
@@ -625,13 +629,13 @@
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 
-#ifndef wxUSE_OWNERDRAWNCOMBOBOX
+#ifndef wxUSE_ODCOMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_OWNERDRAWNCOMBOBOX must be defined."
+#       error "wxUSE_ODCOMBOBOX must be defined."
 #   else
-#       define wxUSE_OWNERDRAWNCOMBOBOX 0
+#       define wxUSE_ODCOMBOBOX 0
 #   endif
-#endif /* !defined(wxUSE_COMBOBOX) */
+#endif /* !defined(wxUSE_ODCOMBOBOX) */
 
 #ifndef wxUSE_PALETTE
 #   ifdef wxABORT_ON_CONFIG_ERROR
@@ -841,6 +845,14 @@
 #   endif
 #endif /* !defined(wxUSE_WXHTML_HELP) */
 
+#ifndef wxUSE_XRC
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XRC must be defined."
+#   else
+#       define wxUSE_XRC 0
+#   endif
+#endif /* !defined(wxUSE_XRC) */
+
 #endif /* wxUSE_GUI */
 
 /*