Merge wxUIActionSimulator fixes from SOC2010_GUI_TEST branch.

[wxWidgets.git] / include / wx / osx / cocoa / chkconf.h

diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h
index 7ef3ca689eef028510f41a93971cb1a193062b78..691acd25ae2f9e5e650f1e11eba20366b8f79a32 100644 (file)
--- a/include/wx/osx/cocoa/chkconf.h
+++ b/include/wx/osx/cocoa/chkconf.h
@@ -20,8 +20,8 @@
     #define wxOSX_USE_NATIVE_TOOLBAR 1
 #endif
 
-/* 
- * text rendering system 
+/*
+ * text rendering system
  */
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
@@ -41,14 +41,21 @@
 #endif
 
 /*
- * turning off capabilities that don't work under cocoa yet
+ * Audio System
  */
 
-#if wxUSE_DATAVIEWCTRL
-#undef wxUSE_DATAVIEWCTRL
-#define wxUSE_DATAVIEWCTRL 0
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+    #define wxOSX_USE_QUICKTIME 0
+    #define wxOSX_USE_AUDIOTOOLBOX 1
+#else // platform < 10.5
+    #define wxOSX_USE_QUICKTIME 1
+    #define wxOSX_USE_AUDIOTOOLBOX 0
 #endif
 
+/*
+ * turning off capabilities that don't work under cocoa yet
+ */
+
 #endif
     /* _WX_MAC_CHKCONF_H_ */