Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use safer RemoveEventHandler() instead of PopEventHandler() (patch 1678016)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-16 00:43:32 +00:00
parent 9092371c0a
commit 0fa5ce0c76
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/mediactrl_am.cpp
View File

@@ -1483,6 +1483,7 @@ public:
LPAMGETERRORTEXT m_lpAMGetErrorText;
wxString GetErrorString(HRESULT hrdsv);
#endif // __WXDEBUG__
wxEvtHandler* m_evthandler;
friend class wxAMMediaEvtHandler;
DECLARE_DYNAMIC_CLASS(wxAMMediaBackend)
@@ -1573,6 +1574,7 @@ wxAMMediaBackend::wxAMMediaBackend()
#endif
m_bestSize(wxDefaultSize)
{
m_evthandler = NULL;
}
//---------------------------------------------------------------------------
@@ -1591,7 +1593,11 @@ wxAMMediaBackend::~wxAMMediaBackend()
if (GetMP())
GetMP()->Release();
m_ctrl->PopEventHandler(true);
if (m_evthandler)
{
m_ctrl->RemoveEventHandler(m_evthandler);
delete m_evthandler;
}
}
}
@@ -1683,7 +1689,8 @@ bool wxAMMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
#endif
);
// Connect for events
m_ctrl->PushEventHandler(new wxAMMediaEvtHandler(this));
m_evthandler = new wxAMMediaEvtHandler(this);
m_ctrl->PushEventHandler(m_evthandler);
//
// Here we set up wx-specific stuff for the default