From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 28 May 2004 18:43:27 +0000 (+0000)
Subject: Make the focus recursion test only for Mac since it breaks MSW.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f463f87dac2c6e211ea7e1c6812e916befe24d63

Make the focus recursion test only for Mac since it breaks MSW.


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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 69b8fa56ae..51f28331ee 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -342,8 +342,13 @@ bool wxControlContainer::DoSetFocus()
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
                (unsigned long)m_winParent->GetHandle());
 
+    // FIXME: this recursion protection is needed for wxMac,
+    // but on Windows (at least), it breaks focus handling.
+    // This needs to be investigated further.
+#ifdef __WXMAC__
     if (m_inSetFocus)
         return true;
+#endif    
 
     m_inSetFocus = true;