Native PalmOS wxLongLong. Introduction of wxULongLong_t due to 'unsigned' not working...

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 5ff16d4f32465ac3a0d518b8cbe4062ad888e4ff..fbccbd0be4e8199e6d7d580781c3d603b37c88dc 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -924,6 +924,25 @@
 #   endif
 #endif  /* wxUSE_DYNLIB_CLASS */
 
 #   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
 
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 


@@ -1243,6 +1262,17 @@
 #   endif
 #endif /* wxUSE_CALENDARCTRL */
 
 #   endif
 #endif /* wxUSE_CALENDARCTRL */
 

+#if wxUSE_DATEPICKCTRL
+#   if !wxUSE_DATETIME
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxDatePickerCtrl requires wxUSE_DATETIME"
+#       else
+#           undef wxUSE_DATETIME
+#           define wxUSE_DATETIME 1
+#       endif
+#   endif
+#endif /* wxUSE_DATEPICKCTRL */
+

 #if wxUSE_CHECKLISTBOX
 #   if !wxUSE_LISTBOX
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_CHECKLISTBOX
 #   if !wxUSE_LISTBOX
 #        ifdef wxABORT_ON_CONFIG_ERROR


@@ -1615,11 +1645,5 @@
 #   endif
 #endif /* wxUSE_XRC */
 
 #   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 */
 
 #endif /* wxUSE_GUI */