Minor corrections to be able to compile with VC++ 1.5C and VC++ 4.1

[wxWidgets.git] / src / generic / panelg.cpp

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index a37cabb6ede74645facadeca1502d62a88e04d26..2ed8f5148cc0c12ad711faacae7a9f58a71bbba1 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -101,7 +101,7 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
     wxWindow *winFocus = event.GetCurrentFocus();
     if (!winFocus)
         winFocus = wxWindow::FindFocus();
-
+       
     if (!winFocus)
     {
         event.Skip();
@@ -126,14 +126,16 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
             // so give them the chance to process it instead of looping inside
             // this panel (normally, the focus will go to the next/previous
             // item after this panel in the parent panel)
+           wxWindow *focussed_child_of_p = this;
             for ( wxWindow *p = GetParent(); p; p = p->GetParent() )
             {
                 if ( wxDynamicCast(p, wxPanel) )
                 {
-                    event.Skip();
-
-                    return;
+                   event.SetCurrentFocus( focussed_child_of_p );
+                   if (p->GetEventHandler()->ProcessEvent( event ))
+                        return;
                 }
+               focussed_child_of_p = p;
             }
 
             // no, we are not inside another panel so process this ourself