From: Kevin Ollivier <kevino@theolliviers.com>
Date: Sat, 28 Oct 2006 00:37:17 +0000 (+0000)
Subject: Calling SetFocus from within an OnFocus handler causes infinite recursion on Mac...
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e718be3e16acb0d6d635bda8b3468efd2a759b66

Calling SetFocus from within an OnFocus handler causes infinite recursion on Mac...


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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index e069544404..7e53044b3e 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1580,8 +1580,10 @@ void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
 {
     if ( event.GetEventType() == wxEVT_SET_FOCUS )
     {
+#ifndef __WXMAC__
         if ( m_text && m_text != ::wxWindow::FindFocus() )
             m_text->SetFocus();
+#endif
     }
 
     Refresh();