that part would have to be removed before, as its condition became always false under 10.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -550,31 +550,6 @@ wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler),
|
|||||||
if (currentMouseWindow->CanAcceptFocus() && wxWindow::FindFocus()!=currentMouseWindow)
|
if (currentMouseWindow->CanAcceptFocus() && wxWindow::FindFocus()!=currentMouseWindow)
|
||||||
currentMouseWindow->SetFocus();
|
currentMouseWindow->SetFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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
|
|
||||||
|
|
||||||
if ( cEvent.GetKind() == kEventMouseDown )
|
|
||||||
{
|
|
||||||
if ( currentMouseWindow->MacIsReallyEnabled() )
|
|
||||||
{
|
|
||||||
EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
|
|
||||||
Point clickLocation = windowMouseLocation ;
|
|
||||||
|
|
||||||
currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
|
|
||||||
|
|
||||||
HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation ,
|
|
||||||
modifiers , (ControlActionUPP ) -1 ) ;
|
|
||||||
|
|
||||||
if ((currentMouseWindowParent != NULL) &&
|
|
||||||
(currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL))
|
|
||||||
{
|
|
||||||
currentMouseWindow = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
result = noErr ;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow )
|
if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow )
|
||||||
|
Reference in New Issue
Block a user