#pragma hdrstop
#endif
-#if wxUSE_MEDIACTRL
+#if wxUSE_MEDIACTRL && wxUSE_ACTIVEX
#include "wx/mediactrl.h"
wxSize m_bestSize; // Actual movie size
bool m_bWasStateChanged; // See the "introduction"
+ wxEvtHandler* m_evthandler;
friend class wxWMP10MediaEvtHandler;
DECLARE_DYNAMIC_CLASS(wxWMP10MediaBackend)
private:
wxWMP10MediaBackend *m_amb;
- DECLARE_NO_COPY_CLASS(wxWMP10MediaEvtHandler)
+ wxDECLARE_NO_COPY_CLASS(wxWMP10MediaEvtHandler);
};
#endif
m_pWMPPlayer(NULL)
{
+ m_evthandler = NULL;
}
//---------------------------------------------------------------------------
m_pAX->DissociateHandle();
delete m_pAX;
- m_ctrl->PopEventHandler(true);
+ if (m_evthandler)
+ {
+ m_ctrl->RemoveEventHandler(m_evthandler);
+ delete m_evthandler;
+ }
#else
AtlAxWinTerm();
_Module.Term();
m_pAX = new wxActiveXContainer(ctrl, IID_IWMPPlayer, m_pWMPPlayer);
// Connect for events
- m_ctrl->PushEventHandler(new wxWMP10MediaEvtHandler(this));
+ m_evthandler = new wxWMP10MediaEvtHandler(this);
+ m_ctrl->PushEventHandler(m_evthandler);
#else
_Module.Init(NULL, ::GetModuleHandle(NULL));
AtlAxWinInit();
::GetClientRect((HWND)ctrl->GetHandle(), &rcClient);
m_wndView.Create((HWND)ctrl->GetHandle(), rcClient, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN, WS_EX_CLIENTEDGE);
hr = m_wndView.QueryHost(&spHost);
- hr = spHost->CreateControl(CComBSTR(_T("{6BF52A52-394A-11d3-B153-00C04F79FAA6}")), m_wndView, 0);
+ hr = spHost->CreateControl(CComBSTR(wxT("{6BF52A52-394A-11d3-B153-00C04F79FAA6}")), m_wndView, 0);
hr = m_wndView.QueryControl(&m_pWMPPlayer);
if( m_pWMPPlayer->get_settings(&m_pWMPSettings) != 0)
}
#endif
-// in source file that contains stuff you don't directly use
-#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(wxmediabackend_wmp10)
+
+// Allow the user code to use wxFORCE_LINK_MODULE() to ensure that this object
+// file is not discarded by the linker.
+#include "wx/link.h"
+wxFORCE_LINK_THIS_MODULE(wxmediabackend_wmp10)
#if 0 // Windows Media Player Mobile 9 hacks
{
WinStruct<SHELLEXECUTEINFO> sei;
sei.lpFile = path.c_str();
- sei.lpVerb = _T("open");
+ sei.lpVerb = wxT("open");
sei.nShow = nShowStyle;
::ShellExecuteEx(&sei);
#endif // WMP mobile 9 hacks
-#endif // wxUSE_MEDIACTRL
+#endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX