// Created: 06.08.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License: wxWindows licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#endif //WX_PRECOMP
// trace mask for focus messages
-#define TRACE_FOCUS _T("focus")
+#define TRACE_FOCUS wxT("focus")
// ============================================================================
// implementation
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)
// (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?") );
}
}
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"));
}
}
}
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();
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();
{
// just to be sure it's not used (normally this is not necessary, but
// doesn't hurt neither)
- m_winLastFocused = (wxWindow *)NULL;
+ m_winLastFocused = NULL;
// start from first or last depending on where we're going
node = forward ? children.GetFirst() : children.GetLast();
// 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();
}
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() );
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
{
// it doesn't count as such any more
- *childLastFocused = (wxWindow *)NULL;
+ *childLastFocused = NULL;
}
}
#endif // __WXMSW__
wxLogTrace(TRACE_FOCUS,
- _T("SetFocusToChild() => first child (0x%p)."),
+ wxT("SetFocusToChild() => first child (0x%p)."),
child->GetHandle());
if (childLastFocused)
projects / wxWidgets.git / blobdiff