X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e1962f77f7243f000a2c63c0adcf94d3876bf18..c16e5a9271ab576a76c8537b67e0f5e25f90bc67:/src/generic/panelg.cpp?ds=inline

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 8c25ac1570..4046f5bd11 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -42,7 +42,7 @@ END_EVENT_TABLE()
 
 wxPanel::wxPanel()
 {
-    m_lastFocus = NULL;
+    m_lastFocus = 0;
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@ -51,7 +51,7 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
-    m_lastFocus = NULL;
+    m_lastFocus = 0;
 
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
 
@@ -120,25 +120,6 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
     {
         if (!node)
         {
-#ifndef __WXGTK__
-     // FIXME seems to enter in an infinite loop - how is this possible?
-            // we arrived at the last/first of our children - but may be this
-            // panel is inside another panel, so make focus go to the next/prev
-            // control in the parent (if we have one)
-            if (GetParent() != NULL)
-            {
-                wxNavigationKeyEvent new_event;
-                new_event.SetDirection( event.GetDirection() );
-                new_event.SetWindowChange(FALSE);
-                new_event.SetCurrentFocus( this );
-
-                if (GetParent()->GetEventHandler()->ProcessEvent(new_event))
-                {
-                    return;
-                }
-            }
-#endif
-
             node = event.GetDirection() ? GetChildren().First()
                                         : GetChildren().Last();
 
@@ -164,8 +145,12 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 
 void wxPanel::OnFocus(wxFocusEvent& event)
 {
-    if ( m_lastFocus )
-        m_lastFocus->SetFocus();
+    if (m_lastFocus != 0)
+    {
+        wxWindow* child = FindWindow(m_lastFocus);
+        if (child)
+            child->SetFocus();
+    }
     else
         event.Skip();
 }