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 8f3f3daab954fd64267219526d5fa0b7eeaaaa7d..2ed8f5148cc0c12ad711faacae7a9f58a71bbba1 100644 (file)
--- 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,13 +34,16 @@ 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()
 
 #endif
 
-wxPanel::wxPanel()
+void wxPanel::Init()
 {
+    m_winLastFocused = (wxWindow *)NULL;
+    m_btnDefault = (wxButton *)NULL;
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@ -48,7 +54,7 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 {
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
 
-    if ( ret ) 
+    if ( ret )
     {
 #ifndef __WXGTK__
         SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
@@ -78,66 +84,94 @@ 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();
-           
-    while (node != start_node)
+
+    wxWindowList::Node *start_node = GetChildren().Find( winFocus );
+    if ( !start_node )
+        start_node = GetChildren().Find( m_winLastFocused );
+    if ( !start_node )
+        start_node = GetChildren().GetFirst();
+
+    wxWindowList::Node *node = event.GetDirection() ? start_node->GetNext()
+                                                    : start_node->GetPrevious();
+
+    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;
-               }
+        if ( !node )
+        {
+            // 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;
             }
-*/
-           
-           node = event.GetDirection() ? m_children.First() : m_children.Last();
-       }
-               
-       wxWindow *child = (wxWindow*) node->Data();
-               
-       if (child->AcceptsFocus())
-       {
-           child->SetFocus();
-           return;
-       }
-               
-       node = node->Next();
+
+            // no, we are not inside another panel so process this ourself
+            node = event.GetDirection() ? GetChildren().GetFirst()
+                                        : GetChildren().GetLast();
+
+            continue;
+        }
+
+        wxWindow *child = node->GetData();
+
+        if ( child->AcceptsFocus() )
+        {
+            // ok, event processed
+            child->SetFocus();
+            return;
+        }
+
+        node = event.GetDirection() ? node->GetNext() : node->GetPrevious();
     }
-    
+
+    // we cycled through all of our children and none of them wanted to accept
+    // focus
     event.Skip();
 }
 
+void wxPanel::OnFocus(wxFocusEvent& event)
+{
+    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();
+}