Updated testconf

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 83d3d1fd6e6f90b0c3e6918cb322cd2d79893fd6..9f719780e4636cc0c54e4fea9e7c25a38a7a38a8 100644 (file)
--- 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 = NULL;
+    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 )
@@ -109,24 +108,24 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
         return;
     }
 
-    wxNode *start_node = GetChildren().Find( winFocus );
+    wxWindowList::Node *start_node = GetChildren().Find( winFocus );
     if (!start_node)
-        start_node = GetChildren().First();
+        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)
     {
         if (!node)
         {
-            node = event.GetDirection() ? GetChildren().First()
-                                        : GetChildren().Last();
+            node = event.GetDirection() ? GetChildren().GetFirst()
+                                        : GetChildren().GetLast();
 
             continue;
         }
 
-        wxWindow *child = (wxWindow *)node->Data();
+        wxWindow *child = node->GetData();
 
         if (child->AcceptsFocus())
         {
@@ -135,7 +134,7 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
             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,8 +144,14 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 
 void wxPanel::OnFocus(wxFocusEvent& event)
 {
-    if ( m_lastFocus )
-        m_lastFocus->SetFocus();
+    if ( m_winLastFocused )
+    {
+        // it might happen that the window got reparented...
+        if ( m_winLastFocused->GetParent() != this )
+            m_winLastFocused = (wxWindow *)NULL;
+        else
+            m_winLastFocused->SetFocus();
+    }
     else
         event.Skip();
 }