X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f8b8785bf01e2bde40e50130a610a20f2909247..fef5c55604e20e2a90843a2278b1f5c8c817dcee:/src/common/containr.cpp diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 2cac0008ac..368cee065d 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -6,7 +6,7 @@ // Created: 06.08.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "containr.h" #endif @@ -36,6 +36,10 @@ #include "wx/containr.h" +#ifdef __WXMAC__ + #include "wx/scrolbar.h" +#endif + // ============================================================================ // implementation // ============================================================================ @@ -45,20 +49,103 @@ wxControlContainer::wxControlContainer(wxWindow *winParent) m_winParent = winParent; m_winLastFocused = + m_winTmpDefault = m_winDefault = NULL; } -void wxControlContainer::SetLastFocus(wxWindow *win) +bool wxControlContainer::AcceptsFocus() const { - // find the last _immediate_ child which got focus - while ( win && win != m_winParent ) + // if we're not shown or disabled, we can't accept focus + if ( m_winParent->IsShown() && m_winParent->IsEnabled() ) { - win = win->GetParent(); + // 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; + +#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 ; +#endif + + while ( node ) + { + wxWindow *child = node->GetData(); + + if ( child->AcceptsFocus() ) + { + return TRUE; + } + +#ifdef __WXMAC__ + wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ; + if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) ) + hasRealChildren = true ; +#endif + node = node->GetNext(); + } + +#ifdef __WXMAC__ + if ( !hasRealChildren ) + return TRUE ; +#endif } - wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") ); + return FALSE; +} + +void wxControlContainer::SetLastFocus(wxWindow *win) +{ + // the panel itself should never get the focus at all but if it does happen + // temporarily (as it seems to do under wxGTK), at the very least don't + // forget our previous m_winLastFocused + if ( win != m_winParent ) + { + // if we're setting the focus + if ( win ) + { + // find the last _immediate_ child which got focus + wxWindow *winParent = win; + while ( winParent != m_winParent ) + { + win = winParent; + winParent = win->GetParent(); + + // Yes, this can happen, though in a totally pathological case. + // like when detaching a menubar from a frame with a child + // which has pushed itself as an event handler for the menubar. + // (under wxGTK) + + wxASSERT_MSG( winParent, + _T("Setting last focus for a window that is not our child?") ); + } + } + + m_winLastFocused = win; + + if ( win ) + { + wxLogTrace(_T("focus"), _T("Set last focus to %s(%s)"), + win->GetClassInfo()->GetClassName(), + win->GetLabel().c_str()); + } + else + { + wxLogTrace(_T("focus"), _T("No more last focus")); + } + } - m_winLastFocused = win; + // propagate the last focus upwards so that our parent can set focus back + // to us if it loses it now and regains later + wxWindow *parent = m_winParent->GetParent(); + if ( parent ) + { + wxChildFocusEvent eventFocus(m_winParent); + parent->GetEventHandler()->ProcessEvent(eventFocus); + } } // ---------------------------------------------------------------------------- @@ -98,7 +185,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // the node of the children list from which we should start looking for the // next acceptable child - wxWindowList::Node *node, *start_node; + wxWindowList::compatibility_iterator node, start_node; // we should start from the first/last control and not from the one which // had focus the last time if we're propagating the event downwards because @@ -113,7 +200,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) node = forward ? children.GetFirst() : children.GetLast(); // we want to cycle over all nodes - start_node = (wxWindowList::Node *)NULL; + start_node = wxWindowList::compatibility_iterator(); } else { @@ -137,7 +224,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) } else { - start_node = (wxWindowList::Node *)NULL; + start_node = wxWindowList::compatibility_iterator(); } if ( !start_node && m_winLastFocused ) @@ -206,12 +293,17 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // and instead give it to the first/last child depending from which // direction we're coming event.SetEventObject(m_winParent); + // disable propagation for this call as otherwise the event might + // bounce back to us. + wxPropagationDisabler disableProp(event); if ( !child->GetEventHandler()->ProcessEvent(event) ) { - // everything is simple: just give focus to it - child->SetFocus(); - + // set it first in case SetFocusFromKbd() results in focus + // change too m_winLastFocused = child; + + // everything is simple: just give focus to it + child->SetFocusFromKbd(); } //else: the child manages its focus itself @@ -235,60 +327,53 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child) if ( child == m_winDefault ) m_winDefault = NULL; + + if ( child == m_winTmpDefault ) + m_winTmpDefault = NULL; } // ---------------------------------------------------------------------------- // focus handling // ---------------------------------------------------------------------------- -void wxControlContainer::DoSetFocus() +bool wxControlContainer::DoSetFocus() { - wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."), - m_winParent->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) - // - // RR: yes, when I the tab key to navigate in a panel with some controls and - // a notebook and the focus jumps to the notebook (typically coming from - // a button at the top) the notebook should focus the first child in the - // current notebook page, not the last one which would otherwise get the - // focus if you used the tab key to navigate from the current notebook - // page to button at the bottom. See every page in the controls sample. - // - // VZ: ok, but this still doesn't (at least I don't see how it can) take - // care of first/last child problem: i.e. if Shift-TAB is pressed in a - // situation like above, the focus should be given to the last child, - // not the first one (and not to the last focused one neither) - I - // think my addition to OnNavigationKey() above takes care of it. - // Keeping #ifdef __WXGTK__ for now, but please try removing it and see - // what happens. - // - // RR: Removed for now. Let's see what happens.. - - if ( !SetFocusToChild() ) + wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."), + (unsigned long)m_winParent->GetHandle()); + + // when the panel gets the focus we move the focus to either the last + // window that had the focus or the first one that can get it unless the + // focus had been already set to some other child + + wxWindow *win = wxWindow::FindFocus(); + while ( win ) { - m_winParent->SetFocus(); + if ( win == m_winParent ) + { + // our child already has focus, don't take it away from it + return TRUE; + } + + if ( win->IsTopLevel() ) + { + // don't look beyond the first top level parent - useless and + // unnecessary + break; + } + + win = win->GetParent(); } + + return SetFocusToChild(); } void wxControlContainer::HandleOnFocus(wxFocusEvent& event) { - wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08x, name: %s"), - m_winParent->GetHandle(), + wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08lx, name: %s"), + (unsigned long)m_winParent->GetHandle(), m_winParent->GetName().c_str() ); - // If we panel got 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(); + DoSetFocus(); event.Skip(); } @@ -306,18 +391,20 @@ bool wxControlContainer::SetFocusToChild() bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) { wxCHECK_MSG( win, FALSE, _T("wxSetFocusToChild(): invalid window") ); + wxCHECK_MSG( childLastFocused, FALSE, + _T("wxSetFocusToChild(): NULL child poonter") ); if ( *childLastFocused ) { - // It might happen that the window got reparented or no longer accepts - // the focus. - if ( (*childLastFocused)->GetParent() == win && - (*childLastFocused)->AcceptsFocusFromKeyboard() ) + // It might happen that the window got reparented + if ( (*childLastFocused)->GetParent() == win ) { wxLogTrace(_T("focus"), - _T("SetFocusToChild() => last child (0x%08x)."), - (*childLastFocused)->GetHandle()); + _T("SetFocusToChild() => last child (0x%08lx)."), + (unsigned long)(*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; } @@ -329,7 +416,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) } // set the focus to the first child who wants it - wxWindowList::Node *node = win->GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); while ( node ) { wxWindow *child = node->GetData(); @@ -337,11 +424,11 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() ) { wxLogTrace(_T("focus"), - _T("SetFocusToChild() => first child (0x%08x)."), - child->GetHandle()); + _T("SetFocusToChild() => first child (0x%08lx)."), + (unsigned long)child->GetHandle()); - *childLastFocused = child; // should be redundant, but it is not - child->SetFocus(); + *childLastFocused = child; + child->SetFocusFromKbd(); return TRUE; } @@ -350,3 +437,4 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) return FALSE; } +