Removed my copy of distutils from the wxPython source tree.

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index f695be633494eb9a769677886b1d77683b100be3..f9595d1f0a53bce3fdddaccb556a31403aa44cdb 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "containr.h"
 #endif
 
     #pragma implementation "containr.h"
 #endif
 


@@ -51,6 +51,7 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
     m_winLastFocused =
     m_winTmpDefault =
     m_winDefault = NULL;
     m_winLastFocused =
     m_winTmpDefault =
     m_winDefault = NULL;

+    m_inSetFocus = false;

 }
 
 bool wxControlContainer::AcceptsFocus() const
 }
 
 bool wxControlContainer::AcceptsFocus() const


@@ -293,6 +294,9 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
             // and instead give it to the first/last child depending from which
             // direction we're coming
             event.SetEventObject(m_winParent);
             // and instead give it to the first/last child depending from which
             // direction we're coming
             event.SetEventObject(m_winParent);

+            // disable propagation for this call as otherwise the event might
+            // bounce back to us.
+            wxPropagationDisabler disableProp(event);

             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // set it first in case SetFocusFromKbd() results in focus
             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // set it first in case SetFocusFromKbd() results in focus


@@ -338,6 +342,9 @@ bool wxControlContainer::DoSetFocus()
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
                (unsigned long)m_winParent->GetHandle());
 
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
                (unsigned long)m_winParent->GetHandle());
 

+    if (m_inSetFocus)
+        return true;
+ 

     // when the panel gets the focus we move the focus to either the last
     // window that had the focus or the first one that can get it unless the
     // focus had been already set to some other child
     // when the panel gets the focus we move the focus to either the last
     // window that had the focus or the first one that can get it unless the
     // focus had been already set to some other child


@@ -348,7 +355,7 @@ 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;
+            return true;

         }
 
         if ( win->IsTopLevel() )
         }
 
         if ( win->IsTopLevel() )


@@ -360,8 +367,15 @@ bool wxControlContainer::DoSetFocus()
 
         win = win->GetParent();
     }
 
         win = win->GetParent();
     }

+    
+    // protect against infinite recursion:
+    m_inSetFocus = true;
+
+    bool ret = SetFocusToChild();
+
+    m_inSetFocus = false;

 
 

-    return SetFocusToChild();
+    return ret;

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