X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc0a395c60f72a065d451778d64969739bf9534..129b8b1a215fc1fcc1b9f06daa0aeaf22bbce614:/src/common/containr.cpp diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 55b6109a9b..bbc5d48b61 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -24,21 +24,17 @@ #pragma hdrstop #endif +#ifndef WX_PRECOMP + #include "wx/containr.h" +#endif + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/event.h" #include "wx/window.h" -#endif //WX_PRECOMP - -#include "wx/containr.h" - -#ifdef __WXMAC__ #include "wx/scrolbar.h" -#endif - -#ifdef __WXMSW__ #include "wx/radiobut.h" -#endif +#endif //WX_PRECOMP // trace mask for focus messages #define TRACE_FOCUS _T("focus") @@ -47,58 +43,60 @@ // implementation // ============================================================================ -wxControlContainer::wxControlContainer(wxWindow *winParent) +// ---------------------------------------------------------------------------- +// wxControlContainerBase +// ---------------------------------------------------------------------------- + +void wxControlContainerBase::SetCanFocus(bool acceptsFocus) { - m_winParent = winParent; + if ( acceptsFocus == m_acceptsFocus ) + return; - m_winLastFocused = - m_winTmpDefault = - m_winDefault = NULL; - m_inSetFocus = false; + m_acceptsFocus = acceptsFocus; + + m_winParent->SetCanFocus(m_acceptsFocus); } -bool wxControlContainer::AcceptsFocus() const +// if the window has a focusable child, it shouldn't be focusable itself (think +// of wxPanel used for grouping different controls) but if it doesn't have any +// (focusable) children, then it should be possible to give it focus (think of +// wxGrid or generic wxListCtrl) +bool wxControlContainerBase::ShouldAcceptFocus() const { - // if we're not shown or disabled, we can't accept focus - if ( m_winParent->IsShown() && m_winParent->IsEnabled() ) + // we can accept focus either if we have no children at all (in this case + // we're probably not used as a container) or only when at least one child + // accepts focus + wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst(); + if ( !node ) + return true; + + while ( node ) { - // otherwise we can accept focus either if we have no children at all - // (in this case we're probably not used as a container) or only when - // at least one child will accept focus - wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst(); - if ( !node ) - return true; + wxWindow *child = node->GetData(); + node = node->GetNext(); #ifdef __WXMAC__ - // wxMac has eventually the two scrollbars as children, they don't count - // as real children in the algorithm mentioned above - bool hasRealChildren = false ; + if ( m_winParent->MacIsWindowScrollbar( child ) ) + continue; #endif - while ( node ) - { - wxWindow *child = node->GetData(); + if ( child->CanAcceptFocus() ) + return false; + } - if ( child->AcceptsFocus() ) - { - return true; - } + return true; +} -#ifdef __WXMAC__ - wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ; - if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) ) - hasRealChildren = true ; -#endif - node = node->GetNext(); - } +#ifndef wxHAS_NATIVE_TAB_TRAVERSAL -#ifdef __WXMAC__ - if ( !hasRealChildren ) - return true ; -#endif - } +// ---------------------------------------------------------------------------- +// generic wxControlContainer +// ---------------------------------------------------------------------------- - return false; +wxControlContainer::wxControlContainer() +{ + m_winLastFocused = NULL; + m_inSetFocus = false; } void wxControlContainer::SetLastFocus(wxWindow *win) @@ -286,6 +284,49 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) const wxWindowList& children = m_winParent->GetChildren(); + // if we have exactly one notebook-like child window (actually it could be + // any window that returns true from its HasMultiplePages()), then + // [Shift-]Ctrl-Tab and Ctrl-PageUp/Down keys should iterate over its pages + // even if the focus is outside of the control because this is how the + // standard MSW properties dialogs behave and we do it under other platforms + // as well because it seems like a good idea -- but we can always put this + // block inside "#ifdef __WXMSW__" if it's not suitable there + if ( event.IsWindowChange() && !goingDown ) + { + // check if we have a unique notebook-like child + wxWindow *bookctrl = NULL; + for ( wxWindowList::const_iterator i = children.begin(), + end = children.end(); + i != end; + ++i ) + { + wxWindow * const window = *i; + if ( window->HasMultiplePages() ) + { + if ( bookctrl ) + { + // this is the second book-like control already so don't do + // anything as we don't know which one should have its page + // changed + bookctrl = NULL; + break; + } + + bookctrl = window; + } + } + + if ( bookctrl ) + { + // make sure that we don't bubble up the event again from the book + // control resulting in infinite recursion + wxNavigationKeyEvent eventCopy(event); + eventCopy.SetEventObject(m_winParent); + if ( bookctrl->GetEventHandler()->ProcessEvent(eventCopy) ) + return; + } + } + // there is not much to do if we don't have children and we're not // interested in "notebook page change" events here if ( !children.GetCount() || event.IsWindowChange() ) @@ -369,12 +410,18 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) for ( ;; ) { // don't go into infinite loop - if ( start_node && node == start_node ) + if ( start_node && node && node == start_node ) break; // Have we come to the last or first item on the panel? if ( !node ) { + if ( !start_node ) + { + // exit now as otherwise we'd loop forever + break; + } + if ( !goingDown ) { // Check if our (maybe grand) parent is another panel: if this @@ -466,7 +513,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) } #endif // __WXMSW__ - if ( child->AcceptsFocusFromKeyboard() ) + if ( child->CanAcceptFocusFromKeyboard() ) { // if we're setting the focus to a child panel we should prevent it // from giving it to the child which had the focus the last time @@ -505,12 +552,6 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child) { if ( child == m_winLastFocused ) m_winLastFocused = NULL; - - if ( child == m_winDefault ) - m_winDefault = NULL; - - if ( child == m_winTmpDefault ) - m_winTmpDefault = NULL; } // ---------------------------------------------------------------------------- @@ -611,8 +652,14 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) while ( node ) { wxWindow *child = node->GetData(); + node = node->GetNext(); - if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() ) +#ifdef __WXMAC__ + if ( child->GetParent()->MacIsWindowScrollbar( child ) ) + continue; +#endif + + if ( child->CanAcceptFocusFromKeyboard() && !child->IsTopLevel() ) { #ifdef __WXMSW__ // If a radiobutton is the first focusable child, search for the @@ -634,10 +681,9 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) child->SetFocusFromKbd(); return true; } - - node = node->GetNext(); } return false; } +#endif // !wxHAS_NATIVE_TAB_TRAVERSAL