fixing focus handling for generic controls in carbon-cfm

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index c05fcac5352a65e015c4bb8b5ede35475f7224ad..22d291df2af99e651c0f7f6c95967ebba1e22e68 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -599,7 +599,10 @@ void wxWindowMac::MacControlUserPaneActivateProc(bool activating)
 
 wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action)
 {
 
 wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action)
 {

-    return kControlNoPart ;
+       if ( AcceptsFocus() )
+               return 1 ;
+       else
+       return kControlNoPart ;

 }
 
 void wxWindowMac::MacControlUserPaneBackgroundProc(void* info)
 }
 
 void wxWindowMac::MacControlUserPaneBackgroundProc(void* info)