added src/mac/carbon/display.cpp to project

[wxWidgets.git] / src / common / containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 69b8fa56aea7a6864958e2de5655947781a61942..4c3b90575d343c9140466d824c6e815fdc0cab55 100644 (file)
--- 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;
     
@@ -357,7 +362,8 @@ bool wxControlContainer::DoSetFocus()
         if ( win == m_winParent )
         {
             // our child already has focus, don't take it away from it
-            return TRUE;
+            m_inSetFocus = false;
+            return true;
         }
 
         if ( win->IsTopLevel() )