X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20b6985553b4e01e7960847e3211d940aeff8742..55bfbcb92b41ab1c6a0d490f2f3fcadefc069bb7:/include/wx/mac/carbon/chkconf.h

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index a3de7145fe..294804f479 100644
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -16,13 +16,14 @@
  * 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
+
+    /* DS: Fixes compilation when wxUSE_FATAL_EXCEPTION is 1 */
+    #ifndef wxTYPE_SA_HANDLER
+        #define wxTYPE_SA_HANDLER int
+    #endif
 #endif
 
 /*
@@ -30,7 +31,31 @@
  */
 
 #ifndef wxMAC_USE_CORE_GRAPHICS
-#define wxMAC_USE_CORE_GRAPHICS 0
+    #define wxMAC_USE_CORE_GRAPHICS 1
+#endif
+
+/*
+ * wxMAC_USE_CORE_GRAPHICS is now implemented in terms of wxUSE_GRAPHICS_CONTEXT
+ */
+ 
+#if wxMAC_USE_CORE_GRAPHICS 
+	#undef wxUSE_GRAPHICS_CONTEXT
+	#define wxUSE_GRAPHICS_CONTEXT 1
+#endif
+
+/*
+ * check graphics context option
+ */
+#if wxUSE_GRAPHICS_CONTEXT && !wxMAC_USE_CORE_GRAPHICS
+#   error "wxUSE_GRAPHICS_CONTEXT on wxMac requires wxMAC_USE_CORE_GRAPHICS"
+#endif
+
+/*
+ * native (1) or emulated (0) toolbar
+ */
+
+#ifndef wxMAC_USE_NATIVE_TOOLBAR
+    #define wxMAC_USE_NATIVE_TOOLBAR 1
 #endif
 
 #endif