X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/382c4adea6e4d0306e65dd871da1c1c821ebce46..458f68d0a7b60ac1366069bb7db57b64d1252fe0:/include/wx/osx/chkconf.h

diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index 70b39c1679..98e950215f 100644
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -21,20 +21,6 @@
 #   define wxUSE_STACKWALKER 0
 #endif /* wxUSE_STACKWALKER */
 
-/*
- * disable the settings which don't work for some compilers
- */
-
-#if defined(__MWERKS__)
-    #undef wxUSE_DEBUG_NEW_ALWAYS
-    #define wxUSE_DEBUG_NEW_ALWAYS      0
-
-    /* DS: Fixes compilation when wxUSE_ON_FATAL_EXCEPTION is 1 */
-    #ifndef wxTYPE_SA_HANDLER
-        #define wxTYPE_SA_HANDLER int
-    #endif
-#endif
-
 /*
  * check graphics context option, must be on for every os x platform
  * we only use core graphics now on all builds, try to catch attempts
@@ -71,7 +57,9 @@
         #undef wxOSX_USE_COCOA
         #define wxOSX_USE_COCOA 1
     #endif
-    #define wxOSX_USE_CARBON 0
+    #if wxOSX_USE_CARBON
+        #error "Carbon does not support 64bit"
+    #endif
     #define wxOSX_USE_IPHONE 0
 #else
     #ifdef __WXOSX_IPHONE__
@@ -105,4 +93,4 @@
     #include "wx/osx/cocoa/chkconf.h"
 #endif
 
-#endif // _WX_OSX_CHKCONF_H_
+#endif /* _WX_OSX_CHKCONF_H_ */