using new API (no visual difference)

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

diff --git a/src/mac/carbon/sound.cpp b/src/mac/carbon/sound.cpp
index 6533416d1fd24de3532e6e4853f2df3f72fdaf1b..9af87b7e0ed1f892b3005334ee215ec146cce077 100644 (file)
--- a/src/mac/carbon/sound.cpp
+++ b/src/mac/carbon/sound.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "sound.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/object.h"
@@ -45,9 +41,11 @@
 
 #ifdef __WXMAC__
 #include "wx/mac/uma.h"
+#ifndef __DARWIN__
 #include <Movies.h>
 #include <Gestalt.h>
 #endif
+#endif
 
 #if defined __WXMAC__ && defined __DARWIN__/*TARGET_CARBON*/
 #ifdef __APPLE_CC__
@@ -64,7 +62,11 @@
 #include <qtml.h>
 #endif
 
+#ifndef __DARWIN__
 #include <QuickTimeComponents.h>
+#else
+#include <QuickTime/QuickTimeComponents.h>
+#endif
 
 //Time between timer calls
 #define MOVIE_DELAY 100
@@ -92,7 +94,7 @@ public:
         DisposeMovie(m_movie);
         Stop();
 
-        //Note that ExitMovies() is not neccessary, but
+        //Note that ExitMovies() is not necessary, but
         //the docs are fuzzy on whether or not TerminateQTML is
         ExitMovies();