X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b95c06ba08b3e6e18ce6430938cf456baef8219f..899544330f37440c140b72a014c518a911b5b7a4:/include/wx/mac/carbon/chkconf.h?ds=sidebyside

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index f9c630775e..ec1bfa37ff 100644
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -20,7 +20,7 @@
     #undef wxUSE_DEBUG_NEW_ALWAYS
     #define wxUSE_DEBUG_NEW_ALWAYS      0
 
-    /* DS: Fixes compilation when wxUSE_FATAL_EXCEPTION is 1 */
+    /* DS: Fixes compilation when wxUSE_ON_FATAL_EXCEPTION is 1 */
     #ifndef wxTYPE_SA_HANDLER
         #define wxTYPE_SA_HANDLER int
     #endif
@@ -31,7 +31,23 @@
  */
 
 #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
 
 /*
@@ -39,7 +55,7 @@
  */
 
 #ifndef wxMAC_USE_NATIVE_TOOLBAR
-    #define wxMAC_USE_NATIVE_TOOLBAR 0
+    #define wxMAC_USE_NATIVE_TOOLBAR 1
 #endif
 
 #endif