X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..931d6a47c32a5b4c283243cb553ce71ee2b535d5:/src/common/containr.cpp?ds=sidebyside diff --git a/src/common/containr.cpp b/src/common/containr.cpp index b79bf180b1..50bbd6aefa 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -4,9 +4,8 @@ // Author: Vadim Zeitlin // Modified by: // Created: 06.08.01 -// RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -37,7 +36,7 @@ #endif //WX_PRECOMP // trace mask for focus messages -#define TRACE_FOCUS _T("focus") +#define TRACE_FOCUS wxT("focus") // ============================================================================ // implementation @@ -47,14 +46,25 @@ // wxControlContainerBase // ---------------------------------------------------------------------------- -void wxControlContainerBase::SetCanFocus(bool acceptsFocus) +void wxControlContainerBase::UpdateParentCanFocus() { - if ( acceptsFocus == m_acceptsFocus ) - return; + // In the ports where it does something non trivial, the parent window + // should only be focusable if it doesn't have any focusable children + // (e.g. native focus handling in wxGTK totally breaks down otherwise). + m_winParent->SetCanFocus(m_acceptsFocusSelf && !m_acceptsFocusChildren); +} + +bool wxControlContainerBase::UpdateCanFocusChildren() +{ + const bool acceptsFocusChildren = HasAnyFocusableChildren(); + if ( acceptsFocusChildren != m_acceptsFocusChildren ) + { + m_acceptsFocusChildren = acceptsFocusChildren; - m_acceptsFocus = acceptsFocus; + UpdateParentCanFocus(); + } - m_winParent->SetCanFocus(m_acceptsFocus); + return m_acceptsFocusChildren; } bool wxControlContainerBase::HasAnyFocusableChildren() const @@ -70,6 +80,30 @@ bool wxControlContainerBase::HasAnyFocusableChildren() const if ( !m_winParent->IsClientAreaChild(child) ) continue; + // Here we check whether the child can accept the focus at all, as we + // want to try focusing it later even if it can't accept it right now. + if ( child->AcceptsFocusRecursively() ) + return true; + } + + return false; +} + +bool wxControlContainerBase::HasAnyChildrenAcceptingFocus() const +{ + const wxWindowList& children = m_winParent->GetChildren(); + for ( wxWindowList::const_iterator i = children.begin(), + end = children.end(); + i != end; + ++i ) + { + const wxWindow * const child = *i; + + if ( !m_winParent->IsClientAreaChild(child) ) + continue; + + // Here we check if the child accepts focus right now as we need to + // know if we can give the focus to it or not. if ( child->CanAcceptFocus() ) return true; } @@ -79,7 +113,7 @@ bool wxControlContainerBase::HasAnyFocusableChildren() const bool wxControlContainerBase::DoSetFocus() { - wxLogTrace(TRACE_FOCUS, _T("SetFocus on wxPanel 0x%p."), + wxLogTrace(TRACE_FOCUS, wxT("SetFocus on wxPanel 0x%p."), m_winParent->GetHandle()); if (m_inSetFocus) @@ -118,6 +152,11 @@ bool wxControlContainerBase::DoSetFocus() return ret; } +bool wxControlContainerBase::AcceptsFocus() const +{ + return m_acceptsFocusSelf && m_winParent->CanBeFocused(); +} + bool wxControlContainerBase::SetFocusToChild() { return wxSetFocusToChild(m_winParent, &m_winLastFocused); @@ -157,7 +196,7 @@ void wxControlContainer::SetLastFocus(wxWindow *win) // (under wxGTK) wxASSERT_MSG( winParent, - _T("Setting last focus for a window that is not our child?") ); + wxT("Setting last focus for a window that is not our child?") ); } } @@ -165,26 +204,13 @@ void wxControlContainer::SetLastFocus(wxWindow *win) if ( win ) { - wxLogTrace(TRACE_FOCUS, _T("Set last focus to %s(%s)"), + wxLogTrace(TRACE_FOCUS, wxT("Set last focus to %s(%s)"), win->GetClassInfo()->GetClassName(), win->GetLabel().c_str()); } else { - wxLogTrace(TRACE_FOCUS, _T("No more last focus")); - } - } - - // propagate the last focus upwards so that our parent can set focus back - // to us if it loses it now and regains later; do *not* do this if we are - // a toplevel window (e.g. wxDialog) that has another frame as its parent - if ( !m_winParent->IsTopLevel() ) - { - wxWindow *parent = m_winParent->GetParent(); - if ( parent ) - { - wxChildFocusEvent eventFocus(m_winParent); - parent->GetEventHandler()->ProcessEvent(eventFocus); + wxLogTrace(TRACE_FOCUS, wxT("No more last focus")); } } } @@ -194,7 +220,7 @@ void wxControlContainer::SetLastFocus(wxWindow *win) // within the same group. Used by wxSetFocusToChild on wxMSW // -------------------------------------------------------------------- -#if defined(__WXMSW__) && wxUSE_RADIOBTN +#if wxUSE_RADIOBTN wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn) { @@ -203,7 +229,7 @@ wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn) const wxWindowList& siblings = btn->GetParent()->GetChildren(); wxWindowList::compatibility_iterator nodeThis = siblings.Find(btn); - wxCHECK_MSG( nodeThis, NULL, _T("radio button not a child of its parent?") ); + wxCHECK_MSG( nodeThis, NULL, wxT("radio button not a child of its parent?") ); // Iterate over all previous siblings until we find the next radio button wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious(); @@ -233,7 +259,7 @@ wxRadioButton* wxGetNextButtonInGroup(wxRadioButton *btn) const wxWindowList& siblings = btn->GetParent()->GetChildren(); wxWindowList::compatibility_iterator nodeThis = siblings.Find(btn); - wxCHECK_MSG( nodeThis, NULL, _T("radio button not a child of its parent?") ); + wxCHECK_MSG( nodeThis, NULL, wxT("radio button not a child of its parent?") ); // Iterate over all previous siblings until we find the next radio button wxWindowList::compatibility_iterator nodeNext = nodeThis->GetNext(); @@ -472,18 +498,21 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // 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 = m_winParent; + wxWindow *focusedParent = m_winParent; while ( parent ) { - // we don't want to tab into a different dialog or frame - if ( focussed_child_of_parent->IsTopLevel() ) + // We don't want to tab into a different dialog or frame or + // even an MDI child frame, so test for this explicitly + // (and in particular don't just use IsTopLevel() which + // would return false in the latter case). + if ( focusedParent->IsTopNavigationDomain() ) break; - event.SetCurrentFocus( focussed_child_of_parent ); + event.SetCurrentFocus( focusedParent ); if ( parent->GetEventHandler()->ProcessEvent( event ) ) return; - focussed_child_of_parent = parent; + focusedParent = parent; parent = parent->GetParent(); } @@ -613,7 +642,7 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child) void wxControlContainer::HandleOnFocus(wxFocusEvent& event) { - wxLogTrace(TRACE_FOCUS, _T("OnFocus on wxPanel 0x%p, name: %s"), + wxLogTrace(TRACE_FOCUS, wxT("OnFocus on wxPanel 0x%p, name: %s"), m_winParent->GetHandle(), m_winParent->GetName().c_str() ); @@ -641,23 +670,45 @@ bool wxControlContainer::SetFocusToChild() bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) { - wxCHECK_MSG( win, false, _T("wxSetFocusToChild(): invalid window") ); + wxCHECK_MSG( win, false, wxT("wxSetFocusToChild(): invalid window") ); // wxCHECK_MSG( childLastFocused, false, - // _T("wxSetFocusToChild(): NULL child poonter") ); + // wxT("wxSetFocusToChild(): NULL child poonter") ); if ( childLastFocused && *childLastFocused ) { // It might happen that the window got reparented if ( (*childLastFocused)->GetParent() == win ) { - wxLogTrace(TRACE_FOCUS, - _T("SetFocusToChild() => last child (0x%p)."), - (*childLastFocused)->GetHandle()); + // And it also could have become hidden in the meanwhile + // We want to focus on the deepest widget visible + wxWindow *deepestVisibleWindow = NULL; - // not SetFocusFromKbd(): we're restoring focus back to the old - // window and not setting it as the result of a kbd action - (*childLastFocused)->SetFocus(); - return true; + while ( *childLastFocused ) + { + if ( (*childLastFocused)->IsShown() ) + { + if ( !deepestVisibleWindow ) + deepestVisibleWindow = *childLastFocused; + } + else + deepestVisibleWindow = NULL; + + *childLastFocused = (*childLastFocused)->GetParent(); + } + + if ( deepestVisibleWindow ) + { + *childLastFocused = deepestVisibleWindow; + + wxLogTrace(TRACE_FOCUS, + wxT("SetFocusToChild() => last child (0x%p)."), + (*childLastFocused)->GetHandle()); + + // not SetFocusFromKbd(): we're restoring focus back to the old + // window and not setting it as the result of a kbd action + (*childLastFocused)->SetFocus(); + return true; + } } else { @@ -692,7 +743,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) #endif // __WXMSW__ wxLogTrace(TRACE_FOCUS, - _T("SetFocusToChild() => first child (0x%p)."), + wxT("SetFocusToChild() => first child (0x%p)."), child->GetHandle()); if (childLastFocused)