fixed wrong assert

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index c26d67adbe789f290627d7ebbea66785ac58d641..9f719780e4636cc0c54e4fea9e7c25a38a7a38a8 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
 


@@ -31,13 +34,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
   EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
 
 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
 
   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,
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,


@@ -46,28 +52,24 @@ 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 ) {
+    if ( ret )
+    {

 #ifndef __WXGTK__
 #ifndef __WXGTK__

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));

 #endif
 #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.
 }
 
 // Responds to colour changes, and passes event on to children.


@@ -80,97 +82,76 @@ void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
     wxWindow::OnSysColourChanged(event);
 }
 

-void wxPanel::OnNavigationKey(wxNavigationKeyEvent& 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();
-}
+    // there is not much to do if we have only one child (or not at all)
+    if (GetChildren().GetCount() < 2)
+    {
+        event.Skip();
+        return;
+    }

 
 

-// set focus to the next child which accepts it (or first/last if node == NULL)
-bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward)
-{
-  // @@ 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;
+    // don't process these ones here
+    if (event.IsWindowChange())
+    {
+        event.Skip();
+        return;

     }
 
     }
 

-    bFound = WIN(node)->AcceptsFocus();
-  }
-#if 0 // to restore when it will really work (now it's triggered all the time)
-  else {
-    // just to be sure it's the right one
-    wxASSERT( WIN(node)->AcceptsFocus() );
-  }
-#endif // 0
-
-  // find the next child which accepts focus
-  bool bParentWantsIt = TRUE;
-  while ( !bFound ) {
-    node = bForward ? node->Next() : node->Previous();
-    if ( node == NULL ) {
-      if ( !bParentWantsIt ) {
-        // we've already been here which means that we've done a whole
-        // cycle without success - get out from the infinite loop
-        return FALSE;
-      }
-
-      // 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;
-      }
-
-      // a sentinel to avoid infinite loops
-      bParentWantsIt = FALSE;
-
-      // wrap around
-      node = bForward ? children->First() : children->Last();
+    wxWindow *winFocus = event.GetCurrentFocus();
+    if (!winFocus)
+        winFocus = wxWindow::FindFocus();
+
+    if (!winFocus)
+    {
+        event.Skip();
+        return;

     }
 
     }
 

-    bFound = WIN(node)->AcceptsFocus();
-  }
+    wxWindowList::Node *start_node = GetChildren().Find( winFocus );
+    if (!start_node)
+        start_node = GetChildren().GetFirst();
+
+    wxWindowList::Node *node = event.GetDirection() ? start_node->GetNext()
+                                                    : start_node->GetPrevious();
+
+    while (node != start_node)
+    {
+        if (!node)
+        {
+            node = event.GetDirection() ? GetChildren().GetFirst()
+                                        : GetChildren().GetLast();
+
+            continue;
+        }
+
+        wxWindow *child = node->GetData();

 
 

-  WIN(node)->SetFocus();
+        if (child->AcceptsFocus())
+        {
+            // ok, event processed
+            child->SetFocus();
+            return;
+        }

 
 

-  #undef WIN
+        node = event.GetDirection() ? node->GetNext() : node->GetPrevious();
+    }

 
 

-  return TRUE;
+    // 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();
+}