fixed crashes in Push/PopEventHandler() if the current handler is NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a38d058525
commit
3a074ba8f6
@ -722,8 +722,13 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
|
||||
|
||||
void wxWindowBase::PushEventHandler(wxEvtHandler *handler)
|
||||
{
|
||||
handler->SetNextHandler(GetEventHandler());
|
||||
GetEventHandler()->SetPreviousHandler(handler);
|
||||
wxEvtHandler *handlerOld = GetEventHandler();
|
||||
|
||||
handler->SetNextHandler(handlerOld);
|
||||
|
||||
if ( handlerOld )
|
||||
GetEventHandler()->SetPreviousHandler(handler);
|
||||
|
||||
SetEventHandler(handler);
|
||||
}
|
||||
|
||||
@ -734,8 +739,11 @@ wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler)
|
||||
{
|
||||
wxEvtHandler *handlerB = handlerA->GetNextHandler();
|
||||
handlerA->SetNextHandler((wxEvtHandler *)NULL);
|
||||
handlerB->SetPreviousHandler((wxEvtHandler *)NULL);
|
||||
|
||||
if ( handlerB )
|
||||
handlerB->SetPreviousHandler((wxEvtHandler *)NULL);
|
||||
SetEventHandler(handlerB);
|
||||
|
||||
if ( deleteHandler )
|
||||
{
|
||||
delete handlerA;
|
||||
|
Loading…
Reference in New Issue
Block a user