enabling correct audio framework on OSX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/carbon/chkconf.h b/include/wx/osx/carbon/chkconf.h
index f9109f2bbf713049218050663d289b318208dc76..5397ae1656eb6921468b8f853712b7fca65550d8 100644 (file)
--- a/include/wx/osx/carbon/chkconf.h
+++ b/include/wx/osx/carbon/chkconf.h
@@ -48,6 +48,13 @@
 
 #endif
 
 
 #endif
 

+/*
+ * Audio System
+ */
+
+#define wxOSX_USE_QUICKTIME 1
+#define wXOSX_USE_AUDIOTOOLBOX 0
+

 #endif
     /* _WX_OSX_CARBON_CHKCONF_H_ */
 
 #endif
     /* _WX_OSX_CARBON_CHKCONF_H_ */
 

diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h
index 47717d721ec9da2a7914fda4cd3bacebaddf76d2..aa048e9263b406c4046257745d107bc0a9b22e1a 100644 (file)
--- a/include/wx/osx/cocoa/chkconf.h
+++ b/include/wx/osx/cocoa/chkconf.h
@@ -40,6 +40,18 @@
 
 #endif
 
 
 #endif
 

+/*
+ * Audio System
+ */
+
+#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
  */
 /*
  * turning off capabilities that don't work under cocoa yet
  */

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index 91892e86bcb8fa81d8cbef3d81199cd4db6c37b6..72068e693ef7cd665454f608c768577d5ade28a3 100644 (file)
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -24,6 +24,9 @@
 #define wxOSX_USE_ATSU_TEXT 0
 #define wxHAS_OPENGL_ES
 
 #define wxOSX_USE_ATSU_TEXT 0
 #define wxHAS_OPENGL_ES
 

+#define wxOSX_USE_QUICKTIME 0
+#define wXOSX_USE_AUDIOTOOLBOX 1
+

 /*
  * turning off capabilities that don't work under iphone yet
  */
 /*
  * turning off capabilities that don't work under iphone yet
  */


@@ -85,8 +88,10 @@
 #define wxUSE_COMBOBOX 0
 #endif
 
 #define wxUSE_COMBOBOX 0
 #endif
 

-#undef wxUSE_SCROLLBAR
+#ifndef __WXUNIVERSAL__
+#undef wxUSE_SCROLLBAR 

 #define wxUSE_SCROLLBAR 0
 #define wxUSE_SCROLLBAR 0

+#endif

 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR
 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR


@@ -97,7 +102,6 @@
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP
 #undef wxUSE_STATBOX
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP
 #undef wxUSE_STATBOX

-#undef wxUSE_CHECKBOX

 #undef wxUSE_RADIOBTN
 #undef wxUSE_RADIOBOX
 #undef wxUSE_TOGGLEBTN
 #undef wxUSE_RADIOBTN
 #undef wxUSE_RADIOBOX
 #undef wxUSE_TOGGLEBTN


@@ -112,7 +116,6 @@
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0
 #define wxUSE_STATBOX 0
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0
 #define wxUSE_STATBOX 0

-#define wxUSE_CHECKBOX 0

 #define wxUSE_RADIOBTN 0
 #define wxUSE_RADIOBOX 0
 #define wxUSE_TOGGLEBTN 0
 #define wxUSE_RADIOBTN 0
 #define wxUSE_RADIOBOX 0
 #define wxUSE_TOGGLEBTN 0


@@ -277,11 +280,12 @@
 #define wxUSE_CLIPBOARD 0
 #endif // wxUSE_CLIPBOARD
 
 #define wxUSE_CLIPBOARD 0
 #endif // wxUSE_CLIPBOARD
 

+/*

 #if wxUSE_GLCANVAS
 #undef wxUSE_GLCANVAS
 #define wxUSE_GLCANVAS 0
 #endif // wxUSE_GLCANVAS
 #if wxUSE_GLCANVAS
 #undef wxUSE_GLCANVAS
 #define wxUSE_GLCANVAS 0
 #endif // wxUSE_GLCANVAS

-
+*/

 
 #if wxUSE_COLOURDLG
 #undef wxUSE_COLOURDLG
 
 #if wxUSE_COLOURDLG
 #undef wxUSE_COLOURDLG