X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77631b1d818c890391b7111a1e499f1317a9ea07..f01a77c7954ff4b7ee9f74af8df5a16f239d3537:/include/wx/mac/carbon/chkconf.h

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index a7759ef6f3..4115fba7a9 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
 
 /*
@@ -42,6 +58,84 @@
     #define wxMAC_USE_NATIVE_TOOLBAR 1
 #endif
 
+/*
+ * using mixins of cocoa functionality
+ */
+ 
+#ifndef wxMAC_USE_COCOA
+    #define wxMAC_USE_COCOA 0
+#endif
+
+/*
+ * setting flags according to the platform
+ */
+
+#ifdef __LP64__
+    #if wxMAC_USE_COCOA == 0
+        #undef wxMAC_USE_COCOA
+        #define wxMAC_USE_COCOA 1
+    #endif
+    #define wxMAC_USE_QUICKDRAW 0
+#else
+    #ifdef __WXASPEN__
+        #define wxMAC_USE_QUICKDRAW 0
+    #else
+        #define wxMAC_USE_QUICKDRAW 1
+    #endif
+#endif
+
+/* 
+ * text rendering system 
+ */
+
+/* we have different options and we turn on all that make sense 
+ * under a certain platform
+ */
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+
+#define wxMAC_USE_CORE_TEXT 1
+#define wxMAC_USE_ATSU_TEXT 0
+
+#else // platform < 10.5
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+#define wxMAC_USE_CORE_TEXT 1
+#else
+#define wxMAC_USE_CORE_TEXT 0
+#endif
+#define wxMAC_USE_ATSU_TEXT 1
+
+#endif
+
+// pure coregraphics text
+#define wxMAC_USE_CG_TEXT 0
+
+/*
+ * turning off capabilities that don't work under 64 bit yet
+ */
+
+#ifdef __LP64__
+
+#if wxUSE_DRAG_AND_DROP
+#undef wxUSE_DRAG_AND_DROP
+#define wxUSE_DRAG_AND_DROP 0
+#endif
+
+#if wxUSE_TASKBARICON
+#undef wxUSE_TASKBARICON
+#define wxUSE_TASKBARICON 0
+#endif
+
+#if wxUSE_TOOLTIPS
+#undef wxUSE_TOOLTIPS
+#define wxUSE_TOOLTIPS 0
+#endif
+
+
+#endif
+
+
 #endif
     /* _WX_MAC_CHKCONF_H_ */