X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0492c5a094d1baac126331385d66d2f66aa5db52..eb254be6df56f99bd2691e4ca38d59004d2f39f5:/src/generic/panelg.cpp?ds=sidebyside

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index f96bb1701b..2ed8f5148c 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -40,9 +40,10 @@ END_EVENT_TABLE()
 
 #endif
 
-wxPanel::wxPanel()
+void wxPanel::Init()
 {
-    m_lastFocus = 0;
+    m_winLastFocused = (wxWindow *)NULL;
+    m_btnDefault = (wxButton *)NULL;
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@ -51,8 +52,6 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
-    m_lastFocus = NULL;
-
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
 
     if ( ret )
@@ -102,40 +101,60 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
     wxWindow *winFocus = event.GetCurrentFocus();
     if (!winFocus)
         winFocus = wxWindow::FindFocus();
-
+	
     if (!winFocus)
     {
         event.Skip();
         return;
     }
 
-    wxNode *start_node = GetChildren().Find( winFocus );
-    if (!start_node)
-        start_node = GetChildren().First();
+    wxWindowList::Node *start_node = GetChildren().Find( winFocus );
+    if ( !start_node )
+        start_node = GetChildren().Find( m_winLastFocused );
+    if ( !start_node )
+        start_node = GetChildren().GetFirst();
 
-    wxNode *node = event.GetDirection() ? start_node->Next()
-                                        : start_node->Previous();
+    wxWindowList::Node *node = event.GetDirection() ? start_node->GetNext()
+                                                    : start_node->GetPrevious();
 
-    while (node != start_node)
+    while ( node != start_node )
     {
-        if (!node)
+        if ( !node )
         {
-            node = event.GetDirection() ? GetChildren().First()
-                                        : GetChildren().Last();
+            // check if our (may be grand) parent is another panel: if this is
+            // the case, they will know what to do with this navigation key and
+            // 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.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
+            node = event.GetDirection() ? GetChildren().GetFirst()
+                                        : GetChildren().GetLast();
 
             continue;
         }
 
-        wxWindow *child = (wxWindow *)node->Data();
+        wxWindow *child = node->GetData();
 
-        if (child->AcceptsFocus())
+        if ( child->AcceptsFocus() )
         {
             // ok, event processed
             child->SetFocus();
             return;
         }
 
-        node = event.GetDirection() ? node->Next() : node->Previous();
+        node = event.GetDirection() ? node->GetNext() : node->GetPrevious();
     }
 
     // we cycled through all of our children and none of them wanted to accept
@@ -145,11 +164,13 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 
 void wxPanel::OnFocus(wxFocusEvent& event)
 {
-    if (m_lastFocus != 0)
+    if ( m_winLastFocused )
     {
-        wxWindow* child = FindWindow(m_lastFocus);
-        if (child)
-            child->SetFocus();
+        // it might happen that the window got reparented...
+        if ( m_winLastFocused->GetParent() != this )
+            m_winLastFocused = (wxWindow *)NULL;
+        else
+            m_winLastFocused->SetFocus();
     }
     else
         event.Skip();