AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't give focus to the window if it ate the left mouse click

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-10-23 21:26:01 +00:00
parent 260a67b7aa
commit f90387b4b4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,15 +521,6 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
cursorPoint += cursorTarget->GetPosition() ; cursorPoint += cursorTarget->GetPosition() ;
} }
// update focus
if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN )
{
// set focus to this window
if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow)
currentMouseWindow->SetFocus();
}
// make tooltips current // make tooltips current
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
@ -542,6 +533,15 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
result = noErr; result = noErr;
else else
{ {
// if the user code did _not_ handle the event, then perform the
// default processing
if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN )
{
// ... that is set focus to this window
if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow)
currentMouseWindow->SetFocus();
}
ControlPartCode dummyPart ; ControlPartCode dummyPart ;
// if built-in find control is finding the wrong control (ie static box instead of overlaid // if built-in find control is finding the wrong control (ie static box instead of overlaid
// button, we cannot let the standard handler do its job, but must handle manually // button, we cannot let the standard handler do its job, but must handle manually