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

Fixes a rare crash.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-12-31 10:22:32 +00:00
parent 555f645a40
commit e10e94693f
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mac/carbon/toplevel.cpp
View File

@@ -506,6 +506,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
else if ( currentMouseWindow )
{
currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ;
wxWindow *currentMouseWindowParent = currentMouseWindow->GetParent();
wxevent.SetEventObject( currentMouseWindow ) ;
@@ -547,6 +548,13 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
#endif
HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation ,
modifiers , (ControlActionUPP ) -1 ) ;
// We need to handle the rare case that the control to
// which the currentMouseWindow points gets deleted as
// a reaction to HandleControlClick. This would lead to
// a crash in the update cursor code below.
if (!currentMouseWindowParent->GetChildren().Find( currentMouseWindow ))
currentMouseWindow = NULL;
}
result = noErr ;
}
@@ -566,7 +574,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
{
cursorTarget = cursorTarget->GetParent() ;
if ( cursorTarget )
cursorPoint += cursorTarget->GetPosition() ;
cursorPoint += cursorTarget->GetPosition();
}
} // else if ( currentMouseWindow )