latest CW additions

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 537816c80d55268194409fd73aa487f41874dc49..966682f7599abc0f46814c019cbf02f10ba57175 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:           wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -21,6 +21,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include "wx/object.h"
+#include "wx/font.h"
+#include "wx/colour.h"

 #include "wx/settings.h"
 #endif
 
 #include "wx/settings.h"
 #endif
 


@@ -46,121 +49,106 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

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

 
 

-  if ( ret ) {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-  }
+    if ( ret )
+    {
+#ifndef __WXGTK__
+        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+#endif
+    }

 
 

-  return ret;
+    return ret;

 }
 
 void wxPanel::InitDialog(void)
 {
 }
 
 void wxPanel::InitDialog(void)
 {

-       wxInitDialogEvent event(GetId());
-       event.SetEventObject(this);
-       GetEventHandler()->ProcessEvent(event);
-}
-
-void wxPanel::SetFocus()
-{
-  SetFocusToNextChild();
+    wxInitDialogEvent event(GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);

 }
 
 // Responds to colour changes, and passes event on to children.
 void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

-    SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

     Refresh();
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 
     Refresh();
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 

-void wxPanel::OnNavigationKey(wxNavigationKeyEvent& event)
-{
-  // don't process these ones here
-  if ( event.IsWindowChange() ) {
-    event.Skip();
-    return;
-  }
-
-  // first of all, find the window which currently has the focus
-  wxNode *node = GetChildren()->First();
-  wxWindow *winFocus = event.GetCurrentFocus();
-  
-  // @@@ no FindFocus() in wxGTK
-  #ifndef __WXGTK__
-    if ( winFocus == NULL )
-      winFocus = wxWindow::FindFocus();
-  #endif
-  
-  while ( node != NULL ) {
-    if ( node->Data() == winFocus )
-      break;
-
-    node = node->Next();
-  }
-
-  if ( !SetFocusToNextChild(node, event.GetDirection()) )
-    event.Skip();
-}
-
-// set focus to the next child which accepts it (or first/last if node == NULL)
-bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward)
+void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )

 {
 {

-       // Added by JACS since this seems to cause an infinite loop.
-       return FALSE;
-
-  // @@ using typed list would be better...
-  #define WIN(node) ((wxWindow *)(node->Data()))
-
-  bool bFound = FALSE;  // have we found a window we will set focus to?
-
-  wxList *children = GetChildren();
-  if ( node == NULL ) {
-    // we've never had focus before
-    node = bForward ? children->First() : children->Last();
-    if ( node == NULL ) {
-      // no children
-      return FALSE;
+    // there is not much to do if we have only one child (or not at all)
+    if (GetChildren().GetCount() < 2)
+    {
+        event.Skip();
+        return;

     }
 
     }
 

-    bFound = WIN(node)->AcceptsFocus();
-  }
-  else {
-    // just to be sure it's the right one
-    wxASSERT( WIN(node)->AcceptsFocus() );
-  }
-
-  // find the next child which accepts focus
-  while ( !bFound ) {
-    node = bForward ? node->Next() : node->Previous();
-    if ( node == NULL ) {
-      // ask parent if he doesn't want to advance focus to the next panel
-      if ( GetParent() != NULL ) {
-        wxNavigationKeyEvent event;
-        event.SetDirection(bForward);
-        event.SetWindowChange(FALSE);
-        event.SetCurrentFocus(this);
-
-        if ( GetParent()->ProcessEvent(event) )
-          return TRUE;
-      }
-
-      // wrap around
-      node = bForward ? children->First() : children->Last();
+    // don't process these ones here
+    if (event.IsWindowChange())
+    {
+        event.Skip();
+        return;

     }
 
     }
 

-    bFound = WIN(node)->AcceptsFocus();
-  }
+    wxWindow *winFocus = event.GetCurrentFocus();
+    if (!winFocus)
+        winFocus = wxWindow::FindFocus();

 
 

-  WIN(node)->SetFocus();
+    if (!winFocus)
+    {
+        event.Skip();
+        return;
+    }

 
 

-  #undef WIN
+    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 0
+            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 // 0
+
+            node = event.GetDirection() ? GetChildren().First()
+                                        : GetChildren().Last();
+        }
+
+        wxWindow *child = (wxWindow *)node->Data();
+
+        if (child->AcceptsFocus())
+        {
+            // ok, event processed
+            child->SetFocus();
+            return;
+        }
+
+        node = event.GetDirection() ? node->Next() : node->Previous();
+    }

 
 

-  return TRUE;
+    // we cycled through all of our children and none of them wanted to accept
+    // focus
+    event.Skip();

 }
 }

+