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

fixed crashes in Push/PopEventHandler() if the current handler is NULL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-08-27 17:03:56 +00:00
parent a38d058525
commit 3a074ba8f6
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/wincmn.cpp
View File

@@ -722,8 +722,13 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
void wxWindowBase::PushEventHandler(wxEvtHandler *handler) void wxWindowBase::PushEventHandler(wxEvtHandler *handler)
{ {
handler->SetNextHandler(GetEventHandler()); wxEvtHandler *handlerOld = GetEventHandler();
GetEventHandler()->SetPreviousHandler(handler);
handler->SetNextHandler(handlerOld);
if ( handlerOld )
GetEventHandler()->SetPreviousHandler(handler);
SetEventHandler(handler); SetEventHandler(handler);
} }
@@ -734,8 +739,11 @@ wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler)
{ {
wxEvtHandler *handlerB = handlerA->GetNextHandler(); wxEvtHandler *handlerB = handlerA->GetNextHandler();
handlerA->SetNextHandler((wxEvtHandler *)NULL); handlerA->SetNextHandler((wxEvtHandler *)NULL);
handlerB->SetPreviousHandler((wxEvtHandler *)NULL);
if ( handlerB )
handlerB->SetPreviousHandler((wxEvtHandler *)NULL);
SetEventHandler(handlerB); SetEventHandler(handlerB);
if ( deleteHandler ) if ( deleteHandler )
{ {
delete handlerA; delete handlerA;