more compilation fixes for VC6 (#9492)

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 56032a719b855bf41c5e3dcb27ffebce6073321b..9fb5dbbf083f82313afe9a94d5564420d68f5ba5 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -121,6 +121,14 @@
 #   endif
 #endif /* !defined(wxUSE_DYNAMIC_LOADER) */
 
 #   endif
 #endif /* !defined(wxUSE_DYNAMIC_LOADER) */
 

+#ifndef wxUSE_INTL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_INTL must be defined."
+#   else
+#       define wxUSE_INTL 0
+#   endif
+#endif /* !defined(wxUSE_INTL) */
+

 #ifndef wxUSE_LOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_LOG must be defined."
 #ifndef wxUSE_LOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_LOG must be defined."


@@ -291,13 +299,13 @@
 #   endif
 #endif /* wxUSE_VARIANT */
 
 #   endif
 #endif /* wxUSE_VARIANT */
 

-#ifndef wxUSE_WEAKREF
+#ifndef wxUSE_XLOCALE

 #   ifdef wxABORT_ON_CONFIG_ERROR
 #   ifdef wxABORT_ON_CONFIG_ERROR

-#       error "wxUSE_WEAKREF must be defined."
+#       error "wxUSE_XLOCALE must be defined."

 #   else
 #   else

-#       define wxUSE_WEAKREF 0
+#       define wxUSE_XLOCALE 0

 #   endif
 #   endif

-#endif /* wxUSE_WEAKREF */
+#endif /* !defined(wxUSE_XLOCALE) */

 
 /*
    Section 1b: all these tests are for GUI only.
 
 /*
    Section 1b: all these tests are for GUI only.


@@ -625,7 +633,7 @@
 #endif /* !defined(wxUSE_HTML) */
 
 #ifndef wxUSE_LIBMSPACK
 #endif /* !defined(wxUSE_HTML) */
 
 #ifndef wxUSE_LIBMSPACK

-#   ifndef __UNIX__
+#   if !defined(__UNIX__) || defined(__WXPALMOS__)

         /* set to 0 on platforms that don't have libmspack */
 #       define wxUSE_LIBMSPACK 0
 #   else
         /* set to 0 on platforms that don't have libmspack */
 #       define wxUSE_LIBMSPACK 0
 #   else


@@ -1028,7 +1036,11 @@
 #  include "wx/x11/chkconf.h"
 #endif
 
 #  include "wx/x11/chkconf.h"
 #endif
 

-#ifdef __UNIX__
+/*
+    __UNIX__ is also defined under Cygwin but we shouldn't perform these checks
+    there if we're building wxMSW.
+ */
+#if defined(__UNIX__) && !defined(__WXMSW__)

 #   include "wx/unix/chkconf.h"
 #endif
 
 #   include "wx/unix/chkconf.h"
 #endif