X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f0c8f31f407ecfce909060464c0ea655221cdab..55410bb4f67febe1ca20654f078ea4fb9a6223ae:/src/osx/carbon/mediactrl.cpp diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp index 475d02540a..662469dfef 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 <wxprojects@comcast.net> // Modified by: @@ -45,19 +45,7 @@ #include "wx/timer.h" #endif -// uma is for wxMacFSSpec -#include "wx/osx/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 @@ -65,6 +53,9 @@ #if USE_QUICKTIME +#include "wx/osx/private.h" +#include <QuickTime/QuickTimeComponents.h> + //--------------------------------------------------------------------------- // Height and Width of movie controller in the movie control (apple samples) //--------------------------------------------------------------------------- @@ -190,7 +181,7 @@ public: private: wxQTMediaBackend *m_qtb; - DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler) + wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler); }; //===========================================================================