Applied patch for multiple file selection, documented.

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 2fe0d395729ef918d22d76ef7220d6031d1e3de1..38d4b13ee3901b7cf37bebf8c3e7f37bf51d607a 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__


@@ -36,13 +36,15 @@ BEGIN_EVENT_TABLE(wxPanel, wxWindow)
   EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
   EVT_SET_FOCUS(wxPanel::OnFocus)
   EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)
   EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
   EVT_SET_FOCUS(wxPanel::OnFocus)
   EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)

+  EVT_SIZE(wxPanel::OnSize)

 END_EVENT_TABLE()
 
 #endif
 
 END_EVENT_TABLE()
 
 #endif
 

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

 {
 {

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

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


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

-    m_lastFocus = NULL;
-

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


@@ -99,7 +99,15 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
         return;
     }
 
         return;
     }
 

-    wxWindow *winFocus = event.GetCurrentFocus();
+    // Did the event emitter tell us where the last focus was?
+    // wxGTK does this in wxWindow, but wxMSW does not. It is
+    // also done in wxPanel if the event is propagated up.
+        wxWindow *winFocus = event.GetCurrentFocus();
+
+    // Do we know where the focus was ourselves, then?
+    if (!winFocus)
+        winFocus = m_winLastFocused;
+

     if (!winFocus)
         winFocus = wxWindow::FindFocus();
 
     if (!winFocus)
         winFocus = wxWindow::FindFocus();
 


@@ -109,51 +117,61 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
         return;
     }
 
         return;
     }
 

-    wxNode *start_node = GetChildren().Find( winFocus );
-    if (!start_node)
-        start_node = GetChildren().First();
+    wxWindowList::Node *start_node = GetChildren().Find( winFocus );
+    if ( !start_node )
+        start_node = GetChildren().Find( m_winLastFocused );
+    if ( !start_node )
+        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)
+    while ( node != start_node )

     {
     {

-        if (!node)
+        // Have we come to the last or first item on the panel?
+        if ( !node )

         {
         {

-#ifndef __WXGTK__
-     // FIXME seems to enter in an infinite loop - how is this possible?
-            // we arrived at the last/first of our children - but may be this
-            // panel is inside another panel, so make focus go to the next/prev
-            // control in the parent (if we have one)
-            if (GetParent() != NULL)
+            // 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_parent = this;
+            for ( wxWindow *parent = GetParent(); parent; parent = parent->GetParent() )

             {
             {

-                wxNavigationKeyEvent new_event;
-                new_event.SetDirection( event.GetDirection() );
-                new_event.SetWindowChange(FALSE);
-                new_event.SetCurrentFocus( this );
+                // we don't want to tab into a different dialog or frame
+                if ( focussed_child_of_parent->IsTopLevel() )
+                    break;

 
 

-                if (GetParent()->GetEventHandler()->ProcessEvent(new_event))
+                // is the parent a panel?
+                wxPanel *panel = wxDynamicCast(parent, wxPanel);
+                if (panel)

                 {
                 {

-                    return;
+                    event.SetCurrentFocus( focussed_child_of_parent );
+                    if (parent->GetEventHandler()->ProcessEvent( event ))
+                        return;

                 }
                 }

+
+                focussed_child_of_parent = parent;

             }
             }

-#endif

 
 

-            node = event.GetDirection() ? GetChildren().First()
-                                        : GetChildren().Last();
+            // no, we are not inside another panel so process this ourself
+            node = event.GetDirection() ? GetChildren().GetFirst()
+                                        : GetChildren().GetLast();

 
 

+            continue;

         }
 
         }
 

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

 
 

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

         {
         {

-            // ok, event processed
+            m_winLastFocused = child;  // should be redundant, but it is not

             child->SetFocus();
             return;
         }
 
             child->SetFocus();
             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


@@ -161,10 +179,69 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
     event.Skip();
 }
 
     event.Skip();
 }
 

+
+void wxPanel::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout()) Layout();
+#endif
+}
+
+void wxPanel::SetFocus()
+{
+    // If the panel gets the focus *by way of getting it set directly*
+    // we move the focus to the first window that can get it.
+
+    wxNode *node = GetChildren().First();
+    while (node)
+    {
+        wxWindow *child = (wxWindow*) node->Data();
+        if (child->AcceptsFocus())
+        {
+            m_winLastFocused = child;   // should be redundant, but it is not
+            child->SetFocus();
+            return;
+        }
+        node = node->Next();
+    }
+
+    m_winLastFocused = (wxWindow*) NULL;
+
+    wxWindow::SetFocus();
+}
+

 void wxPanel::OnFocus(wxFocusEvent& event)
 {
 void wxPanel::OnFocus(wxFocusEvent& event)
 {

-    if ( m_lastFocus )
-        m_lastFocus->SetFocus();
-    else
-        event.Skip();
+    // If the panel gets the focus *by way of getting clicked on*
+    // we move the focus to either the last window that had the 
+    // focus or the first one that can get it.
+
+    if (m_winLastFocused)
+    {
+        // It might happen that the window got reparented or no longer 
+       // accepts the focus.
+        if ((m_winLastFocused->GetParent() == this) &&
+           (m_winLastFocused->AcceptsFocus()))
+        {
+            m_winLastFocused->SetFocus();
+            return;
+        }
+    }
+
+    wxNode *node = GetChildren().First();
+    while (node)
+    {
+        wxWindow *child = (wxWindow*) node->Data();
+        if (child->AcceptsFocus())
+        {
+            m_winLastFocused = child;  // should be redundant, but it is not
+            child->SetFocus();
+            return;
+        }
+        node = node->Next();
+    }
+
+    m_winLastFocused = (wxWindow*) NULL;
+
+    event.Skip();

 }
 }