remove extraneous whitespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
parent
bf56f4ece0
commit
9d7d3b1f9f
@ -68,9 +68,7 @@ LRESULT WXDLLIMPEXP_CORE APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
|
||||
//===========================================================================
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
//
|
||||
// wxAMMediaBackend
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@ -1298,7 +1296,6 @@ public:
|
||||
WPARAM wParam,
|
||||
LPARAM lParam,
|
||||
LRESULT __RPC_FAR *plResult) = 0;
|
||||
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@ -1467,6 +1464,7 @@ public:
|
||||
// WinCE helpers
|
||||
|
||||
wxActiveXContainer* m_pAX;
|
||||
|
||||
#ifdef __WXWINCE__
|
||||
IWMP* m_pWMP;
|
||||
|
||||
@ -1479,6 +1477,7 @@ public:
|
||||
IMediaPlayer* GetMP() { return m_pMP; }
|
||||
IActiveMovie* GetAM() { return m_pAM; }
|
||||
#endif
|
||||
|
||||
wxTimer* m_pTimer;
|
||||
wxSize m_bestSize;
|
||||
|
||||
@ -1492,9 +1491,7 @@ public:
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
//
|
||||
// wxMCIMediaBackend
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@ -1506,7 +1503,6 @@ public:
|
||||
class WXDLLIMPEXP_MEDIA wxMCIMediaBackend : public wxMediaBackendCommonBase
|
||||
{
|
||||
public:
|
||||
|
||||
wxMCIMediaBackend();
|
||||
~wxMCIMediaBackend();
|
||||
|
||||
@ -1559,7 +1555,6 @@ public:
|
||||
#endif
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
//
|
||||
// wxQTMediaBackend
|
||||
//
|
||||
// We don't include Quicktime headers here and define all the types
|
||||
@ -1655,7 +1650,8 @@ struct EventRecord
|
||||
wxUint16 modifiers;
|
||||
};
|
||||
|
||||
enum {
|
||||
enum
|
||||
{
|
||||
mcTopLeftMovie = 1,
|
||||
mcScaleMovieToFit = 2,
|
||||
mcWithBadge = 4,
|
||||
@ -1765,7 +1761,6 @@ public:
|
||||
wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci));
|
||||
wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0);
|
||||
|
||||
|
||||
wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) );
|
||||
wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) );
|
||||
wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0);
|
||||
@ -1928,6 +1923,7 @@ public:
|
||||
ComponentInstance m_pMC; // Movie Controller
|
||||
|
||||
friend class wxQTMediaEvtHandler;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxQTMediaBackend)
|
||||
};
|
||||
|
||||
@ -2027,11 +2023,13 @@ public:
|
||||
if (m_parent->GetMP())
|
||||
{
|
||||
MPReadyStateConstants nState;
|
||||
|
||||
#ifdef __WXWINCE__ //Cast to long needed for IWMP (??)
|
||||
m_parent->GetMP()->get_ReadyState((long*)&nState);
|
||||
#else
|
||||
m_parent->GetMP()->get_ReadyState(&nState);
|
||||
#endif
|
||||
|
||||
if (nState != mpReadyStateLoading)
|
||||
{
|
||||
Stop();
|
||||
@ -2202,6 +2200,7 @@ wxAMMediaBackend::~wxAMMediaBackend()
|
||||
{
|
||||
m_pAX->DissociateHandle();
|
||||
delete m_pAX;
|
||||
|
||||
#ifndef __WXWINCE__
|
||||
m_pAM->Release();
|
||||
#endif
|
||||
@ -2236,8 +2235,8 @@ bool wxAMMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
|
||||
const wxValidator& validator,
|
||||
const wxString& name)
|
||||
{
|
||||
// First get the AMGetErrorText procedure in debug
|
||||
// mode for more meaningful messages
|
||||
// First get the AMGetErrorText procedure in
|
||||
// debug mode for more meaningful messages
|
||||
#ifdef __WXDEBUG__
|
||||
if ( m_dllQuartz.Load(_T("quartz.dll"), wxDL_VERBATIM) )
|
||||
{
|
||||
@ -2792,11 +2791,9 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y),
|
||||
// End of wxAMMediaBackend
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
// wxMCIMediaBackend
|
||||
//
|
||||
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#ifndef __WXWINCE__
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMCIMediaBackend, wxMediaBackend)
|
||||
@ -2888,7 +2885,7 @@ wxMCIMediaBackend::wxMCIMediaBackend() : m_hNotifyWnd(NULL), m_bVideo(false)
|
||||
//---------------------------------------------------------------------------
|
||||
// wxMCIMediaBackend Destructor
|
||||
//
|
||||
// We close the mci device - note that there may not be an mci device here,
|
||||
// We close the MCI device - note that there may not be an MCI device here,
|
||||
// or it may fail - but we don't really care, since we're destructing
|
||||
//---------------------------------------------------------------------------
|
||||
wxMCIMediaBackend::~wxMCIMediaBackend()
|
||||
@ -2904,7 +2901,7 @@ wxMCIMediaBackend::~wxMCIMediaBackend()
|
||||
//---------------------------------------------------------------------------
|
||||
// wxMCIMediaBackend::Create
|
||||
//
|
||||
// Here we just tell wxMediaCtrl that mci does exist (which it does, on all
|
||||
// Here we just tell wxMediaCtrl that MCI does exist (which it does, on all
|
||||
// msw systems, at least in some form dating back to win16 days)
|
||||
//---------------------------------------------------------------------------
|
||||
bool wxMCIMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
|
||||
@ -3257,6 +3254,7 @@ wxSize wxMCIMediaBackend::GetVideoSize() const
|
||||
|
||||
return wxSize(whereParms.rc.right, whereParms.rc.bottom);
|
||||
}
|
||||
|
||||
return wxSize(0, 0);
|
||||
}
|
||||
|
||||
@ -3326,14 +3324,13 @@ LRESULT CALLBACK wxMCIMediaBackend::OnNotifyWndProc(HWND hWnd, UINT nMsg,
|
||||
}
|
||||
#endif // __WXWINCE__
|
||||
|
||||
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
// wxQTMediaBackend
|
||||
//
|
||||
// TODO: Use a less kludgy way to pause/get state/set state
|
||||
// FIXME: Greg Hazel reports that sometimes files that cannot be played
|
||||
// with this backend are treated as playable anyway - not verified though.
|
||||
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
|
||||
|
||||
@ -3539,7 +3536,6 @@ bool wxQTMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
|
||||
//
|
||||
// Since we don't have a child window like most other
|
||||
// backends, we don't need wxCLIP_CHILDREN
|
||||
//
|
||||
if ( !ctrl->wxControl::Create(parent, id, pos, size,
|
||||
(style & ~wxBORDER_MASK) | wxBORDER_NONE,
|
||||
validator, name) )
|
||||
|
||||
Loading…
Reference in New Issue
Block a user