workaroung for handling problems because groupboxes are not included in the parent...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 55aca27152a82ccab49da0bad6bacba5df0e66c3..5c2a5d785d6f519cfc5ccbced383e2a12fca5c4b 100644 (file)
--- 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 ( event.m_metaDown )
                        modifiers |= cmdKey ;

-
+/*

 #if TARGET_CARBON
         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
 #else
 #if TARGET_CARBON
         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
 #else

-//        control = FindControlUnderMouse( localwhere , window , &controlpart ) ;

                controlpart = FindControl( localwhere , window , &control ) ;
 #endif
                controlpart = FindControl( localwhere , window , &control ) ;
 #endif

+*/

                {
                /*
                        if ( AcceptsFocus() && FindFocus() != this )
                {
                /*
                        if ( AcceptsFocus() && FindFocus() != this )


@@ -848,18 +848,17 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
                                SetFocus() ;
                        }
                */
                                SetFocus() ;
                        }
                */

+                   control = m_macControl ;

                        if ( control && ::IsControlActive( control ) )
                        {
                                {
                        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 ;
                                        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 55aca27152a82ccab49da0bad6bacba5df0e66c3..5c2a5d785d6f519cfc5ccbced383e2a12fca5c4b 100644 (file)
--- 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 ( event.m_metaDown )
                        modifiers |= cmdKey ;

-
+/*

 #if TARGET_CARBON
         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
 #else
 #if TARGET_CARBON
         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
 #else

-//        control = FindControlUnderMouse( localwhere , window , &controlpart ) ;

                controlpart = FindControl( localwhere , window , &control ) ;
 #endif
                controlpart = FindControl( localwhere , window , &control ) ;
 #endif

+*/

                {
                /*
                        if ( AcceptsFocus() && FindFocus() != this )
                {
                /*
                        if ( AcceptsFocus() && FindFocus() != this )


@@ -848,18 +848,17 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
                                SetFocus() ;
                        }
                */
                                SetFocus() ;
                        }
                */

+                   control = m_macControl ;

                        if ( control && ::IsControlActive( control ) )
                        {
                                {
                        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 ;
                                        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 ) ;

                                        }
                                }
                        }
                                        }
                                }
                        }