From 280df0853330e63840a73e6fcd238e0304db2be2 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 15 Sep 2001 20:39:46 +0000 Subject: [PATCH] changed FindControl to FindControlUnderMouse and use ControlRef != NULL instead of ControlPart = noPart , we had false ControlPart = 0 returned under Carbon in MacOS X git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/control.cpp | 5 +++-- src/mac/control.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 1d23a5eaae..d9735a9c22 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -835,7 +835,8 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) if ( event.m_metaDown ) modifiers |= cmdKey ; - controlpart = FindControl( localwhere , window , &control ) ; +// controlpart = FindControl( localwhere , window , &control ) ; + control = FindControlUnderMouse( localwhere , window , &controlpart ) ; { /* if ( AcceptsFocus() && FindFocus() != this ) @@ -851,7 +852,7 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) else controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ; wxTheApp->s_lastMouseDown = 0 ; - if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) + if ( control && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice { MacHandleControlClick( control , controlpart ) ; diff --git a/src/mac/control.cpp b/src/mac/control.cpp index 1d23a5eaae..d9735a9c22 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -835,7 +835,8 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) if ( event.m_metaDown ) modifiers |= cmdKey ; - controlpart = FindControl( localwhere , window , &control ) ; +// controlpart = FindControl( localwhere , window , &control ) ; + control = FindControlUnderMouse( localwhere , window , &controlpart ) ; { /* if ( AcceptsFocus() && FindFocus() != this ) @@ -851,7 +852,7 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) else controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ; wxTheApp->s_lastMouseDown = 0 ; - if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) + if ( control && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice { MacHandleControlClick( control , controlpart ) ;