SN: Replaced __WXOS2__ by __WXPM__ in #ifdefs

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 70006c5ea04da40d1d483217ee86e16e568afbd8..0218693d28f7cb55dc27c8cd3900e3d028ba0145 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,23 +21,29 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include "wx/object.h"
+#include "wx/font.h"
+#include "wx/colour.h"

 #include "wx/settings.h"
 #include "wx/settings.h"

+#include "wx/log.h"

 #endif
 
 #include "wx/generic/panelg.h"
 
 #endif
 
 #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)
 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_NAVIGATION_KEY(wxPanel::OnNavigationKey)

+  EVT_SIZE(wxPanel::OnSize)

 END_EVENT_TABLE()
 
 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,22 @@ 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 ) {
-#ifndef __WXGTK__
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-#endif
-  }
+    if ( ret )
+    {
+        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    }

 
 

-  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 +80,190 @@ 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()) )
+    // there is not much to do if we have only one child (or not at all)
+    if (GetChildren().GetCount() < 2)
+    {
+        event.Skip();
+        return;
+    }
+
+    // don't process these ones here
+    if (event.IsWindowChange())
+    {
+        event.Skip();
+        return;
+    }
+
+    // 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)
+    {
+        event.Skip();
+        return;
+    }
+
+    wxWindowList::Node *start_node = GetChildren().Find( winFocus );
+    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();
+
+    while ( node != start_node )
+    {
+        // Have we come to the last or first item on the panel?
+        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).
+            wxWindow *focussed_child_of_parent = this;
+            for ( wxWindow *parent = GetParent(); parent; parent = parent->GetParent() )
+            {
+                // we don't want to tab into a different dialog or frame
+                if ( focussed_child_of_parent->IsTopLevel() )
+                    break;
+
+                // 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
+            node = event.GetDirection() ? GetChildren().GetFirst()
+                                        : GetChildren().GetLast();
+
+            continue;
+        }
+
+        wxWindow *child = node->GetData();
+
+        if ( child->AcceptsFocus() )
+        {
+            m_winLastFocused = child;  // should be redundant, but it is not
+            child->SetFocus();
+            return;
+        }
+
+        node = event.GetDirection() ? node->GetNext() : node->GetPrevious();
+    }
+
+    // we cycled through all of our children and none of them wanted to accept
+    // focus

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

-// set focus to the next child which accepts it (or first/last if node == NULL)
-bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward)
+
+void wxPanel::OnSize(wxSizeEvent& WXUNUSED(event))

 {
 {

-  // @@ 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;
-    }
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#endif
+}

 
 

-    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() );
-  }
+void wxPanel::SetFocus()
+{
+    wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."), GetHandle());
+
+    // 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.
+
+    // VZ: no, we set the focus to the last window too. I don't understand why
+    //     should we make this distinction: if an app wants to set focus to
+    //     some precise control, it may always do it directly, but if we don't
+    //     use m_winLastFocused here, the focus won't be set correctly after a
+    //     notebook page change nor after frame activation under MSW (it calls
+    //     SetFocus too)
+    //
+    //     If you still want to have old behaviour for wxGTK, edit the
+    //     following line
+#if 0 // def __WXGTK__
+    m_winLastFocused = (wxWindow *)NULL;

 #endif // 0
 
 #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();
+    if ( !SetFocusToChild() )
+    {
+        wxWindow::SetFocus();

     }
     }

+}

 
 

-    bFound = WIN(node)->AcceptsFocus();
-  }
-
-  WIN(node)->SetFocus();
+void wxPanel::OnFocus(wxFocusEvent& event)
+{
+    wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08x."), GetHandle());

 
 

-  #undef WIN
+    // 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.
+    (void)SetFocusToChild();

 
 

-  return TRUE;
+    event.Skip();

 }
 
 }
 

+bool wxPanel::SetFocusToChild()
+{
+    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() )
+        {
+            wxLogTrace(_T("focus"),
+                       _T("SetFocusToChild() => last child (0x%08x)."),
+                       m_winLastFocused->GetHandle());
+
+            m_winLastFocused->SetFocus();
+            return TRUE;
+        }
+        else
+        {
+            // it doesn't count as such any more
+            m_winLastFocused = (wxWindow *)NULL;
+        }
+    }
+
+    // set the focus to the first child who wants it
+    wxWindowList::Node *node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow *child = node->GetData();
+        if ( child->AcceptsFocus() )
+        {
+            wxLogTrace(_T("focus"),
+                       _T("SetFocusToChild() => first child (0x%08x)."),
+                       child->GetHandle());
+
+            m_winLastFocused = child;  // should be redundant, but it is not
+            child->SetFocus();
+            return TRUE;
+        }
+
+        node = node->GetNext();
+    }
+
+    return FALSE;
+}