X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04662def27c4227f8372084167e3a37729c048b9..9548c49a6a1e4533976450205de136d9edbe91b0:/src/common/containr.cpp?ds=sidebyside diff --git a/src/common/containr.cpp b/src/common/containr.cpp index b76ec648d6..5b5df9ea92 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -45,31 +45,59 @@ wxControlContainer::wxControlContainer(wxWindow *winParent) m_winParent = winParent; m_winLastFocused = + m_winTmpDefault = m_winDefault = NULL; } void wxControlContainer::SetLastFocus(wxWindow *win) { - // if we're setting the focus - if ( 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 ) { - // find the last _immediate_ child which got focus but be prepared to - // handle the case when win == m_winParent as well - wxWindow *winParent = win; - while ( winParent != m_winParent ) + // if we're setting the focus + if ( win ) { - win = winParent; - winParent = win->GetParent(); + // 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?") ); + } + } - // 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. (wxGtk) + m_winLastFocused = win; - wxASSERT_MSG( winParent, _T("Setting last-focus for a window that is not our child?") ); + 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); + } } // ---------------------------------------------------------------------------- @@ -219,10 +247,12 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) event.SetEventObject(m_winParent); 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 @@ -246,6 +276,9 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child) if ( child == m_winDefault ) m_winDefault = NULL; + + if ( child == m_winTmpDefault ) + m_winTmpDefault = NULL; } // ---------------------------------------------------------------------------- @@ -254,42 +287,21 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child) 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 our child already has focus, don't take it away from it + 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 ) { if ( win == m_winParent ) + { + // our child already has focus, don't take it away from it return TRUE; + } if ( win->IsTopLevel() ) { @@ -306,14 +318,11 @@ bool wxControlContainer::DoSetFocus() 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(); } @@ -331,18 +340,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; } @@ -362,11 +373,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(); + child->SetFocusFromKbd(); return TRUE; }