wxHTML compilation fixes

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 2b74c654456e3016a6ab56eb78683be89ff7bf9d..a37cabb6ede74645facadeca1502d62a88e04d26 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -40,9 +40,10 @@ END_EVENT_TABLE()
 
 #endif
 
 
 #endif
 

-wxPanel::wxPanel()
+void wxPanel::Init()

 {
 {

-    m_lastFocus = 0;
+    m_winLastFocused = (wxWindow *)NULL;
+    m_btnDefault = (wxButton *)NULL;

 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,


@@ -51,8 +52,6 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-    m_lastFocus = 0;
-

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


@@ -110,16 +109,34 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
     }
 
     wxWindowList::Node *start_node = GetChildren().Find( winFocus );
     }
 
     wxWindowList::Node *start_node = GetChildren().Find( winFocus );

-    if (!start_node)
+    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();
 
         start_node = GetChildren().GetFirst();
 
     wxWindowList::Node *node = event.GetDirection() ? start_node->GetNext()
                                                     : start_node->GetPrevious();
 

-    while (node != start_node)
+    while ( node != start_node )

     {
     {

-        if (!node)
+        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)
+            for ( wxWindow *p = GetParent(); p; p = p->GetParent() )
+            {
+                if ( wxDynamicCast(p, wxPanel) )
+                {
+                    event.Skip();
+
+                    return;
+                }
+            }
+
+            // no, we are not inside another panel so process this ourself

             node = event.GetDirection() ? GetChildren().GetFirst()
                                         : GetChildren().GetLast();
 
             node = event.GetDirection() ? GetChildren().GetFirst()
                                         : GetChildren().GetLast();
 


@@ -128,7 +145,7 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 
         wxWindow *child = node->GetData();
 
 
         wxWindow *child = node->GetData();
 

-        if (child->AcceptsFocus())
+        if ( child->AcceptsFocus() )

         {
             // ok, event processed
             child->SetFocus();
         {
             // ok, event processed
             child->SetFocus();


@@ -145,11 +162,13 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 
 void wxPanel::OnFocus(wxFocusEvent& event)
 {
 
 void wxPanel::OnFocus(wxFocusEvent& event)
 {

-    if (m_lastFocus != 0)
+    if ( m_winLastFocused )

     {
     {

-        wxWindow* child = FindWindow(m_lastFocus);
-        if (child)
-            child->SetFocus();
+        // it might happen that the window got reparented...
+        if ( m_winLastFocused->GetParent() != this )
+            m_winLastFocused = (wxWindow *)NULL;
+        else
+            m_winLastFocused->SetFocus();

     }
     else
         event.Skip();
     }
     else
         event.Skip();