moved SetBestSize() to .cpp file; set min size from it

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 46ba51d014cac1eeba4e5c59ddf6b4a881b317d7..5cfbacacd73a0736e8b2aec5a11227e3bb9769eb 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -592,6 +592,14 @@
 #   endif
 #endif /* !defined(wxUSE_SLIDER) */
 
+#ifndef wxUSE_SOUND
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_SOUND must be defined."
+#   else
+#       define wxUSE_SOUND 0
+#   endif
+#endif /* !defined(wxUSE_SOUND) */
+
 #ifndef wxUSE_SPINBTN
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SPINBTN must be defined."
@@ -778,17 +786,6 @@
 #   endif
 #endif /* wxUSE_PROTOCOL */
 
-#if wxUSE_GZSTREAM
-#   if !wxUSE_ZLIB
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_GZSTREAM requires wxUSE_ZLIB"
-#       else
-#           undef wxUSE_ZLIB
-#           define wxUSE_ZLIB 1
-#       endif
-#   endif
-#endif /* wxUSE_GZSTREAM */
-
 /* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */
 #if wxUSE_HTML
 #   if !wxUSE_FILESYSTEM
@@ -872,7 +869,7 @@
 
 /* ODBC and Unicode are now compatible */
 
-#if 0 // wxUSE_ODBC && wxUSE_UNICODE
+#if 0 /* wxUSE_ODBC && wxUSE_UNICODE */
 #   ifdef wxABORT_ON_CONFIG_ERROR
         /* (ODBC classes aren't Unicode-compatible yet) */
 #       error "wxUSE_ODBC can't be used with wxUSE_UNICODE"
@@ -1126,7 +1123,7 @@
 #   endif
 #endif /* wxMGL */
 
-// Hopefully we can emulate these dialogs in due course
+/* Hopefully we can emulate these dialogs in due course */
 #if wxUSE_SMARTPHONE
 #   ifdef wxUSE_COLOURDLG
 #       undef wxUSE_COLOURDLG
@@ -1213,6 +1210,104 @@
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
 
+#if !wxUSE_IMAGE
+/*
+   The default wxUSE_IMAGE setting is 1, so if it's set to 0 we assume the
+   user explicitly wants this and disable all other features that require
+   wxUSE_IMAGE.
+ */
+#   if wxUSE_DRAGIMAGE
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_DRAGIMAGE requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_DRAGIMAGE
+#            define wxUSE_DRAGIMAGE 0
+#        endif
+#   endif
+
+#   if wxUSE_LIBPNG
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_LIBPNG requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_LIBPNG
+#            define wxUSE_LIBPNG 0
+#        endif
+#   endif
+
+#   if wxUSE_LIBJPEG
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_LIBJPEG requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_LIBJPEG
+#            define wxUSE_LIBJPEG 0
+#        endif
+#   endif
+
+#   if wxUSE_LIBTIFF
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_LIBTIFF requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_LIBTIFF
+#            define wxUSE_LIBTIFF 0
+#        endif
+#   endif
+
+#   if wxUSE_GIF
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_GIF requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_GIF
+#            define wxUSE_GIF 0
+#        endif
+#   endif
+
+#   if wxUSE_PNM
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_PNM requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_PNM
+#            define wxUSE_PNM 0
+#        endif
+#   endif
+
+#   if wxUSE_PCX
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_PCX requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_PCX
+#            define wxUSE_PCX 0
+#        endif
+#   endif
+
+#   if wxUSE_IFF
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_IFF requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_IFF
+#            define wxUSE_IFF 0
+#        endif
+#   endif
+
+#   if wxUSE_TOOLBAR
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_TOOLBAR requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_TOOLBAR
+#            define wxUSE_TOOLBAR 0
+#        endif
+#   endif
+
+#   if wxUSE_XPM
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_XPM requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_XPM
+#            define wxUSE_XPM 0
+#        endif
+#   endif
+
+#endif /* !wxUSE_IMAGE */
+
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 #   if !wxUSE_MENUS
 #        ifdef wxABORT_ON_CONFIG_ERROR