X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5e0b4bc7c729ff41e66fb7894fb1387f860bdb2..7249080588e30b4740adc138e793ffa0ead4b5ef:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ea06200c60..3d05c7c85c 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -15,7 +15,9 @@
    Compiler-specific checking.
  */
 
-#if defined(__WXMSW__)
+#if defined(__PALMOS__)
+#  include "wx/palmos/chkconf.h"
+#elif defined(__WXMSW__)
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXMAC__)
 #  include "wx/mac/chkconf.h"
@@ -411,6 +413,14 @@
 #   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 */
@@ -1162,12 +1172,12 @@
 #endif /* wxMGL */
 
 /* Hopefully we can emulate these dialogs in due course */
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
 #   ifdef wxUSE_COLOURDLG
 #       undef wxUSE_COLOURDLG
 #       define wxUSE_COLOURDLG 0
 #   endif
-#endif /* __SMARTPHONE__ */
+#endif /* __SMARTPHONE__ && __WXWINCE__ */
 
 
 /* generic controls dependencies */
@@ -1263,7 +1273,7 @@
 #endif /* wxUSE_HELP */
 
 #if wxUSE_WXHTML_HELP
-#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK
+#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "Built in help controller can't be compiled"
 #       else
@@ -1275,6 +1285,8 @@
 #           define wxUSE_COMBOBOX 1
 #           undef wxUSE_NOTEBOOK
 #           define wxUSE_NOTEBOOK 1
+#           undef wxUSE_SPINCTRL
+#           define wxUSE_SPINCTRL 1
 #       endif
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
@@ -1448,6 +1460,17 @@
 #   endif
 #endif /* wxUSE_FILEDLG */
 
+#if !wxUSE_GAUGE
+#   if wxUSE_PROGRESSDLG
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "Progress dialog require wxUSE_GAUGE"
+#       else
+#           undef wxUSE_GAUGE
+#           define wxUSE_GAUGE 1
+#       endif
+#   endif
+#endif /* !wxUSE_GAUGE */
+
 #if !wxUSE_BUTTON
 #   if wxUSE_PROGRESSDLG || \
        wxUSE_FONTDLG || \
@@ -1465,7 +1488,7 @@
 #           define wxUSE_BUTTON 1
 #       endif
 #   endif
-#endif /* wxUSE_PROGRESSDLG */
+#endif /* !wxUSE_BUTTON */
 
 #if !wxUSE_TOOLBAR
 #   if wxUSE_TOOLBAR_NATIVE
@@ -1574,5 +1597,14 @@
 #   endif
 #endif /* wxUSE_WX_RESOURCES */
 
+#if wxUSE_XRC && !wxUSE_XML
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XRC requires wxUSE_XML"
+#   else
+#       undef wxUSE_XRC
+#       define wxUSE_XRC 0
+#   endif
+#endif /* wxUSE_XRC */
+
 #endif /* wxUSE_GUI */