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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 8f3f3daab9..4046f5bd11 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:           wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -21,6 +21,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+#include "wx/object.h"
+#include "wx/font.h"
+#include "wx/colour.h"
 #include "wx/settings.h"
 #endif
 
@@ -31,6 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
   EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
+  EVT_SET_FOCUS(wxPanel::OnFocus)
   EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)
 END_EVENT_TABLE()
 
@@ -38,6 +42,7 @@ END_EVENT_TABLE()
 
 wxPanel::wxPanel()
 {
+    m_lastFocus = 0;
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@ -46,9 +51,11 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
+    m_lastFocus = 0;
+
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
 
-    if ( ret ) 
+    if ( ret )
     {
 #ifndef __WXGTK__
         SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
@@ -78,66 +85,72 @@ void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 {
-    if (m_children.GetCount() < 2) 
+    // there is not much to do if we have only one child (or not at all)
+    if (GetChildren().GetCount() < 2)
     {
         event.Skip();
         return;
     }
 
     // don't process these ones here
-    if (event.IsWindowChange()) 
+    if (event.IsWindowChange())
     {
         event.Skip();
         return;
     }
 
     wxWindow *winFocus = event.GetCurrentFocus();
-    if (!winFocus) winFocus = wxWindow::FindFocus();
-    
+    if (!winFocus)
+        winFocus = wxWindow::FindFocus();
+
     if (!winFocus)
     {
         event.Skip();
         return;
     }
-    
-    wxNode *start_node = m_children.Find( winFocus );
-    if (!start_node) start_node = m_children.First();
-    
-    wxNode *node = event.GetDirection() ? start_node->Next() : start_node->Previous();
-	    
+
+    wxNode *start_node = GetChildren().Find( winFocus );
+    if (!start_node)
+        start_node = GetChildren().First();
+
+    wxNode *node = event.GetDirection() ? start_node->Next()
+                                        : start_node->Previous();
+
     while (node != start_node)
     {
-	if (!node)
-	{
-/*
-            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;
-		}
-            }
-*/
-	    
-	    node = event.GetDirection() ? m_children.First() : m_children.Last();
-	}
-	        
-	wxWindow *child = (wxWindow*) node->Data();
-		
-	if (child->AcceptsFocus())
-	{
-	    child->SetFocus();
-	    return;
-	}
-		
-	node = node->Next();
+        if (!node)
+        {
+            node = event.GetDirection() ? GetChildren().First()
+                                        : GetChildren().Last();
+
+            continue;
+        }
+
+        wxWindow *child = (wxWindow *)node->Data();
+
+        if (child->AcceptsFocus())
+        {
+            // ok, event processed
+            child->SetFocus();
+            return;
+        }
+
+        node = event.GetDirection() ? node->Next() : node->Previous();
     }
-    
+
+    // we cycled through all of our children and none of them wanted to accept
+    // focus
     event.Skip();
 }
 
+void wxPanel::OnFocus(wxFocusEvent& event)
+{
+    if (m_lastFocus != 0)
+    {
+        wxWindow* child = FindWindow(m_lastFocus);
+        if (child)
+            child->SetFocus();
+    }
+    else
+        event.Skip();
+}