non-osx methods bracketed

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 7331f4858b40319826534365f127f41cdbed43a7..6673f2906f3fd8a9e0fe3293e266925ddacf8e0c 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -496,6 +496,14 @@
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */
 
+#ifndef wxUSE_MDI
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_MDI must be defined."
+#   else
+#       define wxUSE_MDI 0
+#   endif
+#endif /* !defined(wxUSE_MDI) */
+
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_MDI_ARCHITECTURE must be defined."
@@ -786,17 +794,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
@@ -1351,6 +1348,15 @@
 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #if wxUSE_MDI_ARCHITECTURE
+#   if !wxUSE_MDI
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "MDI requires wxUSE_MDI"
+#        else
+#            undef wxUSE_MDI
+#            define wxUSE_MDI 1
+#        endif
+#   endif
+
 #   if !wxUSE_DOC_VIEW_ARCHITECTURE
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"