Win64 compilation fixes: define SIZEOF_SIZE_T, added wxUIntPtr

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index afbb47412421b0e02adb4687ef25c3e8c76ea913..c752d2570915798a05885c4532a27a09f36ca5f8 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1,13 +1,13 @@
-/*
- * Name:        wx/chkconf.h
- * Purpose:     check the config settings for consistency
- * Author:      Vadim Zeitlin
- * Modified by:
- * Created:     09.08.00
- * RCS-ID:      $Id$
- * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
- * Licence:     wxWindows licence
- */
+/**
+* Name:        wx/chkconf.h
+* Purpose:     check the config settings for consistency
+* Author:      Vadim Zeitlin
+* Modified by:
+* Created:     09.08.00
+* RCS-ID:      $Id$
+* Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
+* Licence:     wxWindows licence
+*/
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
@@ -403,6 +403,19 @@
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
+#ifndef wxUSE_LIBMSPACK
+#   ifndef __UNIX__
+        /* set to 0 on platforms that don't have libmspack */
+#       define wxUSE_LIBMSPACK 0
+#   else
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_LIBMSPACK must be defined."
+#       else
+#           define wxUSE_LIBMSPACK 0
+#       endif
+#   endif
+#endif /* !defined(wxUSE_LIBMSPACK) */
+
 #ifndef wxUSE_ICO_CUR
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ICO_CUR must be defined."
@@ -579,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."
@@ -857,7 +878,9 @@
 #   endif
 #endif /* wxUSE_UNICODE_MSLU */
 
-#if wxUSE_ODBC && wxUSE_UNICODE
+/* ODBC and Unicode are now compatible */
+
+#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"