Doc fixes A-M edition. Thanks to Arnout for pointing these out. Also I fixed some...

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 5072accba8653325fc3099f48f550db9ee3befb8..5ff16d4f32465ac3a0d518b8cbe4062ad888e4ff 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1546,13 +1546,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
@@ -1609,5 +1615,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 */