X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf354396f61a2e1bd5544b67ecde341b6ff9bf35..27c78e4552aaefac9a4db0d4453eff09cdfef2ad:/src/msw/mediactrl.cpp diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp index 7020198882..7c2e511cfd 100644 --- a/src/msw/mediactrl.cpp +++ b/src/msw/mediactrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/mediactrl.cpp +// Name: src/msw/mediactrl.cpp // Purpose: Built-in Media Backends for Windows // Author: Ryan Norton // Modified by: @@ -25,10 +25,6 @@ // Pre-compiled header stuff //--------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mediactrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -165,23 +161,23 @@ struct IMediaEvent : public IDispatch enum ReadyStateConstants { - amvUninitialized = 0, - amvLoading = 1, + amvUninitialized = 0, + amvLoading = 1, amvInteractive = 3, - amvComplete = 4 + amvComplete = 4 }; enum StateConstants { amvNotLoaded = -1, - amvStopped = 0, - amvPaused = 1, - amvRunning = 2 + amvStopped = 0, + amvPaused = 1, + amvRunning = 2 }; enum DisplayModeConstants { - amvTime = 0, + amvTime = 0, amvFrames = 1 }; @@ -1354,7 +1350,7 @@ public: m_hwnd = hwnd; m_qtb->m_ctrl->Connect(m_qtb->m_ctrl->GetId(), - wxEVT_ERASE_BACKGROUND, + wxEVT_ERASE_BACKGROUND, wxEraseEventHandler(wxQTMediaEvtHandler::OnEraseBackground), NULL, this ); @@ -1380,7 +1376,7 @@ private: // //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend); +IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend) //--------------------------------------------------------------------------- // Usual debugging macros @@ -2184,7 +2180,7 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y), // //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -IMPLEMENT_DYNAMIC_CLASS(wxMCIMediaBackend, wxMediaBackend); +IMPLEMENT_DYNAMIC_CLASS(wxMCIMediaBackend, wxMediaBackend) //--------------------------------------------------------------------------- // Usual debugging macros for MCI returns @@ -2712,7 +2708,7 @@ LRESULT CALLBACK wxMCIMediaBackend::OnNotifyWndProc(HWND hWnd, UINT nMsg, // with this backend are treated as playable anyway - not verifyed though. //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend); +IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend) //Time between timer calls - this is the Apple recommondation to the TCL //team I believe @@ -3540,12 +3536,10 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt) //--------------------------------------------------------------------------- //in source file that contains stuff you don't directly use -#include -FORCE_LINK_ME(basewxmediabackends); +#include "wx/html/forcelnk.h" +FORCE_LINK_ME(basewxmediabackends) //--------------------------------------------------------------------------- // End wxMediaCtrl Compilation Guard and this file //--------------------------------------------------------------------------- #endif //wxUSE_MEDIACTRL - -