X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489468feaa08b8f504735eecca522fb8d0f825d2..0d19936d71032ba7658616faed3b63d4c930e5b4:/src/osx/carbon/mediactrl.cpp diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp index 9d525f5b59..40deec3d81 100644 --- 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 // Modified by: @@ -45,19 +45,7 @@ #include "wx/timer.h" #endif -// uma is for wxMacFSSpec -#include "wx/mac/uma.h" - -// standard QT stuff -#ifndef __DARWIN__ -#include -#include -#include -#else -#include -#endif - -#if !defined(__LP64__) +#if wxOSX_USE_CARBON #define USE_QUICKTIME 1 #else #define USE_QUICKTIME 0 @@ -65,6 +53,9 @@ #if USE_QUICKTIME +#include "wx/osx/private.h" +#include + //--------------------------------------------------------------------------- // Height and Width of movie controller in the movie control (apple samples) //---------------------------------------------------------------------------