mac more native types

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

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index a876f055b0daea9c54fbefec345e57fccad0ba22..150af0827055710b95cbefac8590da35963314f4 100644 (file)
--- 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,16 @@
  */
 
 #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
 
 /*
@@ -46,9 +55,40 @@
  */
 
 #ifndef wxMAC_USE_NATIVE_TOOLBAR
-    #define wxMAC_USE_NATIVE_TOOLBAR 0
+    #define wxMAC_USE_NATIVE_TOOLBAR 1
 #endif
 
+/*
+ * using mixins of cocoa functionality
+ */
+ 
+#ifndef wxMAC_USE_COCOA
+    #define wxMAC_USE_COCOA 0
+#endif
+
+/*
+ * setting up 64 bit
+ */
+
+#ifdef __LP64__
+
+#undef wxMAC_USE_COCOA
+#define wxMAC_USE_COCOA 1
+
+#undef wxUSE_DRAG_AND_DROP
+#define wxUSE_DRAG_AND_DROP 0
+
+#undef wxUSE_TASKBARICON
+#define wxUSE_TASKBARICON 0
+
+#undef wxUSE_TOOLTIPS
+#define wxUSE_TOOLTIPS 0
+
+
+
+#endif
+
+
 #endif
     /* _WX_MAC_CHKCONF_H_ */