merging in the toolbar changes

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

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


@@ -29,16 +29,15 @@
 
 #include "wx/generic/panelg.h"
 
 
 #include "wx/generic/panelg.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
   EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
   EVT_SET_FOCUS(wxPanel::OnFocus)
   EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
   EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
   EVT_SET_FOCUS(wxPanel::OnFocus)
   EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)

+  EVT_SIZE(wxPanel::OnSize)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif

 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {


@@ -98,7 +97,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();
 


@@ -119,21 +126,31 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 
     while ( node != start_node )
     {
 
     while ( node != start_node )
     {

+        // Have we come to the last or first item on the panel?

         if ( !node )
         {
         if ( !node )
         {

-            // check if our (may be grand) parent is another panel: if this is
+            // 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
             // 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() )
+            // item after this panel in the parent panel).
+            wxWindow *focussed_child_of_parent = this;
+            for ( wxWindow *parent = GetParent(); parent; parent = parent->GetParent() )

             {
             {

-                if ( wxDynamicCast(p, wxPanel) )
-                {
-                    event.Skip();
+                // we don't want to tab into a different dialog or frame
+                if ( focussed_child_of_parent->IsTopLevel() )
+                    break;

 
 

-                    return;
+                // is the parent a panel?
+                wxPanel *panel = wxDynamicCast(parent, wxPanel);
+                if (panel)
+                {
+                    event.SetCurrentFocus( focussed_child_of_parent );
+                    if (parent->GetEventHandler()->ProcessEvent( event ))
+                        return;

                 }
                 }

+
+                focussed_child_of_parent = parent;

             }
 
             // no, we are not inside another panel so process this ourself
             }
 
             // no, we are not inside another panel so process this ourself


@@ -147,7 +164,7 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
 
         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;
         }


@@ -160,16 +177,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_winLastFocused )
+    // 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...
-        if ( m_winLastFocused->GetParent() != this )
-            m_winLastFocused = (wxWindow *)NULL;
-        else
+        // 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();
             m_winLastFocused->SetFocus();

+            return;
+        }

     }
     }

-    else
-        event.Skip();
+
+    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();

 }
 }