fixed wrong assert

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 966682f7599abc0f46814c019cbf02f10ba57175..9f719780e4636cc0c54e4fea9e7c25a38a7a38a8 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -34,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,


@@ -105,37 +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)
         {

-#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();
+            node = event.GetDirection() ? GetChildren().GetFirst()
+                                        : GetChildren().GetLast();
+
+            continue;

         }
 
         }
 

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

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


@@ -144,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


@@ -152,3 +142,16 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
     event.Skip();
 }
 
     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();
+}