Better fix

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

diff --git a/include/wx/mac/chkconf.h b/include/wx/mac/chkconf.h
index e7c5d596c5a3d66f052e256aa670bdc9d9870be0..916c1625748da628bdf31b02b22cae35dc430974 100644 (file)
--- a/include/wx/mac/chkconf.h
+++ b/include/wx/mac/chkconf.h
@@ -1,30 +1,34 @@
 /*
  * Name:        wx/mac/chkconf.h
- * Purpose:     Compiler-specific configuration checking
- * Author:      Julian Smart
+ * Purpose:     Mac-specific config settings checks
+ * Author:      Vadim Zeitlin
  * Modified by:
- * Created:     01/02/97
+ * Created:     2005-04-05 (extracted from wx/chkconf.h)
  * RCS-ID:      $Id$
- * Copyright:   (c) Julian Smart
+ * Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
 
-#ifndef _WX_MAC_CHKCONF_H_
-#define _WX_MAC_CHKCONF_H_
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
-/*
- * disable the settings which don't work for some compilers
- */
-
-/*
- * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
- */
-
-#if defined(__MWERKS__)
-    #undef wxUSE_DEBUG_NEW_ALWAYS
-    #define wxUSE_DEBUG_NEW_ALWAYS      0
+#if wxUSE_UNICODE
+#    if !TARGET_CARBON
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_UNICODE is only supported for Carbon Targets."
+#        else
+#            define wxUSE_UNICODE 0
+#        endif
+#    endif
 #endif
 
-#endif
-    /* _WX_MAC_CHKCONF_H_ */
+#if wxUSE_STACKWALKER
+    /* not supported under Mac */
+#   undef wxUSE_STACKWALKER
+#   define wxUSE_STACKWALKER 0
+#endif /* wxUSE_STACKWALKER */
 
+#ifdef __WXMAC_CLASSIC__
+#   include "wx/mac/classic/chkconf.h"
+#else
+#   include "wx/mac/carbon/chkconf.h"
+#endif