Rename wxGetFileType to wxGetFileKind

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 5c62297ac1b6a83094686aa8246e8e1c13e66a93..c69e95ebd625e871920e6ec303b9e683ed6e3b88 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -924,6 +924,25 @@
 #   endif
 #endif  /* wxUSE_DYNLIB_CLASS */
 
+#if wxUSE_ZIPSTREAM
+#   if !wxUSE_ZLIB
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxZip requires wxZlib"
+#       else
+#           undef wxUSE_ZLIB
+#           define wxUSE_ZLIB 1
+#       endif
+#   endif
+#   if !wxUSE_ARCHIVE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxZip requires wxArchive"
+#       else
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 1
+#       endif
+#   endif
+#endif /* wxUSE_ZIPSTREAM */
+
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 
@@ -1015,7 +1034,9 @@
 #ifndef wxUSE_NATIVE_STATUSBAR
 #   define wxUSE_NATIVE_STATUSBAR 0
 #elif wxUSE_NATIVE_STATUSBAR
-#   if defined(__WXUNIVERSAL__) || !(defined(__WXMSW__) || !defined(__WXMAC__))
+#   if defined(__WXUNIVERSAL__) || !( defined(__WXMSW__) || \
+                                      defined(__WXMAC__) || \
+                                      defined(__WXPALMOS__) )
 #       undef wxUSE_NATIVE_STATUSBAR
 #       define wxUSE_NATIVE_STATUSBAR 0
 #   endif
@@ -1155,26 +1176,6 @@
 #       endif
 #   endif  /* wxUSE_DYNAMIC_LOADER */
 
-#   if !wxUSE_ON_FATAL_EXCEPTION
-#       if wxUSE_CRASHREPORT
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
-#           else
-#               undef wxUSE_CRASHREPORT
-#               define wxUSE_CRASHREPORT 0
-#           endif
-#       endif
-
-#       if wxUSE_STACKWALKER
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_STACKWALKER requires wxUSE_ON_FATAL_EXCEPTION"
-#           else
-#               undef wxUSE_STACKWALKER
-#               define wxUSE_STACKWALKER 0
-#           endif
-#       endif
-#   endif /* wxUSE_ON_FATAL_EXCEPTION */
-
 #endif /* wxMSW */
 
 /* wxMAC-specific dependencies */
@@ -1564,13 +1565,19 @@
 #endif
 
 #if wxUSE_RADIOBOX
-#   if !wxUSE_RADIOBTN || !wxUSE_STATBOX
+#   if !wxUSE_RADIOBTN
 #        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxUSE_RADIOBOX requires wxUSE_RADIOBTN and wxUSE_STATBOX"
+#            error "wxUSE_RADIOBOX requires wxUSE_RADIOBTN"
 #        else
 #            undef wxUSE_RADIOBTN
-#            undef wxUSE_STATBOX
 #            define wxUSE_RADIOBTN 1
+#        endif
+#   endif
+#   if !wxUSE_STATBOX && !defined(__WXPALMOS__)
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_RADIOBOX requires wxUSE_STATBOX"
+#        else
+#            undef wxUSE_STATBOX
 #            define wxUSE_STATBOX 1
 #        endif
 #   endif
@@ -1627,5 +1634,11 @@
 #   endif
 #endif /* wxUSE_XRC */
 
+/* The generic date picker uses a popup window */
+#if !wxUSE_POPUPWIN
+#    undef wxUSE_DATEPICKCTRL
+#    define wxUSE_DATEPICKCTRL 0
+#endif  /* !wxUSE_POPUPWIN */
+
 #endif /* wxUSE_GUI */