From f78024a1f98fac96991a9f87804000512a32a976 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 4 Nov 2001 21:02:06 +0000 Subject: [PATCH] workaroung for handling problems because groupboxes are not included in the parent-child relationship in wxwindows in a geometrical correct way git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/control.cpp | 17 ++++++++--------- src/mac/control.cpp | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 55aca27152..5c2a5d785d 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -834,13 +834,13 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) if ( event.m_metaDown ) modifiers |= cmdKey ; - +/* #if TARGET_CARBON control = FindControlUnderMouse( localwhere , window , &controlpart ) ; #else -// control = FindControlUnderMouse( localwhere , window , &controlpart ) ; controlpart = FindControl( localwhere , window , &control ) ; #endif +*/ { /* if ( AcceptsFocus() && FindFocus() != this ) @@ -848,18 +848,17 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) SetFocus() ; } */ + control = m_macControl ; if ( control && ::IsControlActive( control ) ) { { - if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() ) - controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ; - else - controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ; + controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ; wxTheApp->s_lastMouseDown = 0 ; - if ( control && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) - && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice + if ( control && controlpart != kControlNoPart && + ! IsKindOf( CLASSINFO( wxScrollBar ) ) + ) // otherwise we will get the event twice for scrollbar { - MacHandleControlClick( control , controlpart ) ; + MacHandleControlClick( control , controlpart ) ; } } } diff --git a/src/mac/control.cpp b/src/mac/control.cpp index 55aca27152..5c2a5d785d 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -834,13 +834,13 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) if ( event.m_metaDown ) modifiers |= cmdKey ; - +/* #if TARGET_CARBON control = FindControlUnderMouse( localwhere , window , &controlpart ) ; #else -// control = FindControlUnderMouse( localwhere , window , &controlpart ) ; controlpart = FindControl( localwhere , window , &control ) ; #endif +*/ { /* if ( AcceptsFocus() && FindFocus() != this ) @@ -848,18 +848,17 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) SetFocus() ; } */ + control = m_macControl ; if ( control && ::IsControlActive( control ) ) { { - if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() ) - controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ; - else - controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ; + controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ; wxTheApp->s_lastMouseDown = 0 ; - if ( control && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) - && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice + if ( control && controlpart != kControlNoPart && + ! IsKindOf( CLASSINFO( wxScrollBar ) ) + ) // otherwise we will get the event twice for scrollbar { - MacHandleControlClick( control , controlpart ) ; + MacHandleControlClick( control , controlpart ) ; } } }