X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..510649e4d5e8eaf8967ddd082f3eb5945471eb5e:/src/generic/panelg.cpp?ds=sidebyside diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index 244cb0aedb..9f719780e4 100644 --- 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 -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -34,13 +34,16 @@ 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) END_EVENT_TABLE() #endif -wxPanel::wxPanel() +void wxPanel::Init() { + m_winLastFocused = (wxWindow *)NULL; + m_btnDefault = (wxButton *)NULL; } bool wxPanel::Create(wxWindow *parent, wxWindowID id, @@ -51,7 +54,7 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id, { bool ret = wxWindow::Create(parent, id, pos, size, style, name); - if ( ret ) + if ( ret ) { #ifndef __WXGTK__ SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); @@ -81,6 +84,7 @@ void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event) void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event ) { + // there is not much to do if we have only one child (or not at all) if (GetChildren().GetCount() < 2) { event.Skip(); @@ -88,59 +92,66 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event ) } // don't process these ones here - if (event.IsWindowChange()) + if (event.IsWindowChange()) { event.Skip(); return; } wxWindow *winFocus = event.GetCurrentFocus(); - if (!winFocus) winFocus = wxWindow::FindFocus(); - + if (!winFocus) + winFocus = wxWindow::FindFocus(); + if (!winFocus) { event.Skip(); return; } - - wxNode *start_node = GetChildren().Find( winFocus ); - if (!start_node) start_node = GetChildren().First(); - - wxNode *node = event.GetDirection() ? start_node->Next() : start_node->Previous(); - + + wxWindowList::Node *start_node = GetChildren().Find( winFocus ); + if (!start_node) + start_node = GetChildren().GetFirst(); + + wxWindowList::Node *node = event.GetDirection() ? start_node->GetNext() + : start_node->GetPrevious(); + while (node != start_node) { - if (!node) - { -/* - 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; - } - } -*/ - - node = event.GetDirection() ? GetChildren().First() : GetChildren().Last(); - } - - wxWindow *child = (wxWindow*) node->Data(); - - if (child->AcceptsFocus()) - { - child->SetFocus(); - return; - } - - node = node->Next(); + if (!node) + { + node = event.GetDirection() ? GetChildren().GetFirst() + : GetChildren().GetLast(); + + continue; + } + + wxWindow *child = node->GetData(); + + if (child->AcceptsFocus()) + { + // ok, event processed + 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(); } +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(); +}