Reset m_inSetFocus for other exit point in this function:

could explain why the focus protection code was broken

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

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