fixed infinite recursion in SetFocus()

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

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 456c8354d3d377a0f01c2393fccf215b5fb9c2cc..11a3dddf98cabd9fa6e14701c4b480e2e5d0f00e 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -52,8 +52,9 @@ public:
     void HandleOnFocus(wxFocusEvent& event);
     void HandleOnWindowDestroy(wxWindowBase *child);
 
     void HandleOnFocus(wxFocusEvent& event);
     void HandleOnWindowDestroy(wxWindowBase *child);
 

-    // should be called from SetFocus()
-    void DoSetFocus();
+    // should be called from SetFocus(), returns FALSE if we did nothing with
+    // the focus and the default processing should take place
+    bool DoSetFocus();

 
 protected:
     // set the focus to the child which had it the last time
 
 protected:
     // set the focus to the child which had it the last time


@@ -119,7 +120,8 @@ void classname::RemoveChild(wxWindowBase *child) \
  \
 void classname::SetFocus() \
 { \
  \
 void classname::SetFocus() \
 { \

-    container->DoSetFocus(); \
+    if ( !container->DoSetFocus() ) \
+        wxWindow::SetFocus(); \

 } \
  \
 void classname::OnChildFocus(wxChildFocusEvent& event) \
 } \
  \
 void classname::OnChildFocus(wxChildFocusEvent& event) \

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 2cac0008accd3ddc106fc5213faae21029b0835a..04a7794bfefc093259ef3f2484c9475f88a6c573 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -241,7 +241,7 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 // focus handling
 // ----------------------------------------------------------------------------
 
 // focus handling
 // ----------------------------------------------------------------------------
 

-void wxControlContainer::DoSetFocus()
+bool wxControlContainer::DoSetFocus()

 {
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
                m_winParent->GetHandle());
 {
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
                m_winParent->GetHandle());


@@ -273,10 +273,7 @@ void wxControlContainer::DoSetFocus()
     //
     // RR: Removed for now. Let's see what happens..
 
     //
     // RR: Removed for now. Let's see what happens..
 

-    if ( !SetFocusToChild() )
-    {
-        m_winParent->SetFocus();
-    }
+    return SetFocusToChild();

 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)