Updated testconf

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 8c25ac15707394c791c202f34d0f01a191d8e13c..9f719780e4636cc0c54e4fea9e7c25a38a7a38a8 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -40,9 +40,10 @@ END_EVENT_TABLE()
 
 #endif
 
 
 #endif
 

-wxPanel::wxPanel()
+void wxPanel::Init()

 {
 {

-    m_lastFocus = NULL;
+    m_winLastFocused = (wxWindow *)NULL;
+    m_btnDefault = (wxButton *)NULL;

 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,


@@ -51,8 +52,6 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-    m_lastFocus = NULL;
-

     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
 
     if ( ret )
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
 
     if ( ret )


@@ -109,43 +108,24 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
         return;
     }
 
         return;
     }
 

-    wxNode *start_node = GetChildren().Find( winFocus );
+    wxWindowList::Node *start_node = GetChildren().Find( winFocus );

     if (!start_node)
     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)
         {
 
     while (node != start_node)
     {
         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();
+            node = event.GetDirection() ? GetChildren().GetFirst()
+                                        : GetChildren().GetLast();

 
             continue;
         }
 
 
             continue;
         }
 

-        wxWindow *child = (wxWindow *)node->Data();
+        wxWindow *child = node->GetData();

 
         if (child->AcceptsFocus())
         {
 
         if (child->AcceptsFocus())
         {


@@ -154,7 +134,7 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
             return;
         }
 
             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
     }
 
     // we cycled through all of our children and none of them wanted to accept


@@ -164,8 +144,14 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 
 void wxPanel::OnFocus(wxFocusEvent& 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();
 }
     else
         event.Skip();
 }