splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

[wxWidgets.git] / src / mac / carbon / sound.cpp

diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index c3afc15e01963be13698dcca1efcc24dad394280..b3ff384fc86d9544d2b81cede45cca6357e8de31 100644 (file)
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -71,7 +71,7 @@
 static wxTimer* lastSoundTimer=NULL;
 static bool lastSoundIsPlaying=false;
 
 static wxTimer* lastSoundTimer=NULL;
 static bool lastSoundIsPlaying=false;
 

-#if !defined(__DARWIN__) || !defined(__LP64__)
+#if !defined(__LP64__)

 #define USE_QUICKTIME 1
 #else
 #define USE_QUICKTIME 0
 #define USE_QUICKTIME 1
 #else
 #define USE_QUICKTIME 0


@@ -393,7 +393,7 @@ bool wxSound::DoPlay(unsigned flags) const
             Handle dataRef = NULL;
             OSType dataRefType;
 
             Handle dataRef = NULL;
             OSType dataRefType;
 

-            err = QTNewDataReferenceFromFullPathCFString(wxMacCFStringHolder(m_sndname,wxLocale::GetSystemEncoding()),
+            err = QTNewDataReferenceFromFullPathCFString(wxCFStringRef(m_sndname,wxLocale::GetSystemEncoding()),

                 (UInt32)kQTNativeDefaultPathStyle, 0, &dataRef, &dataRefType);
 
             wxASSERT(err == noErr);
                 (UInt32)kQTNativeDefaultPathStyle, 0, &dataRef, &dataRefType);
 
             wxASSERT(err == noErr);