10.4 support for osx-cocoa

[wxWidgets.git] / src / osx / carbon / mediactrl.cpp

diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp
index 9d525f5b592f7cd05128652332ff83e1de51d6f7..40deec3d811b76639537ff1347cc171fa3924a62 100644 (file)
--- a/src/osx/carbon/mediactrl.cpp
+++ b/src/osx/carbon/mediactrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/mediactrl.cpp
+// Name:        src/osx/carbon/mediactrl.cpp

 // Purpose:     Built-in Media Backends for Mac
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Purpose:     Built-in Media Backends for Mac
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:


@@ -45,19 +45,7 @@
     #include "wx/timer.h"
 #endif
 
     #include "wx/timer.h"
 #endif
 

-// uma is for wxMacFSSpec
-#include "wx/mac/uma.h"
-
-// standard QT stuff
-#ifndef __DARWIN__
-#include <Movies.h>
-#include <Gestalt.h>
-#include <QuickTimeComponents.h>
-#else
-#include <QuickTime/QuickTimeComponents.h>
-#endif
-
-#if !defined(__LP64__)
+#if wxOSX_USE_CARBON

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


@@ -65,6 +53,9 @@
 
 #if USE_QUICKTIME
 
 
 #if USE_QUICKTIME
 

+#include "wx/osx/private.h"
+#include <QuickTime/QuickTimeComponents.h>
+

 //---------------------------------------------------------------------------
 // Height and Width of movie controller in the movie control (apple samples)
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // Height and Width of movie controller in the movie control (apple samples)
 //---------------------------------------------------------------------------