// 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
return false;
}
+bool wxControlContainerBase::DoSetFocus()
+{
+ wxLogTrace(TRACE_FOCUS, wxT("SetFocus on wxPanel 0x%p."),
+ m_winParent->GetHandle());
+
+ if (m_inSetFocus)
+ return true;
+
+ // 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() )
+ {
+ // don't look beyond the first top level parent - useless and
+ // unnecessary
+ break;
+ }
+
+ win = win->GetParent();
+ }
+
+ // protect against infinite recursion:
+ m_inSetFocus = true;
+
+ bool ret = SetFocusToChild();
+
+ m_inSetFocus = false;
+
+ return ret;
+}
+
+bool wxControlContainerBase::SetFocusToChild()
+{
+ return wxSetFocusToChild(m_winParent, &m_winLastFocused);
+}
+
#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
// ----------------------------------------------------------------------------
wxControlContainer::wxControlContainer()
{
m_winLastFocused = NULL;
- m_inSetFocus = false;
}
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?") );
}
}
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"));
+ wxLogTrace(TRACE_FOCUS, wxT("No more last focus"));
}
}
// within the same group. Used by wxSetFocusToChild on wxMSW
// --------------------------------------------------------------------
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && wxUSE_RADIOBTN
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();
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();
void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
{
- wxWindow *parent = m_winParent->GetParent();
+ // for a TLW we shouldn't involve the parent window, it has nothing to do
+ // with keyboard navigation inside this TLW
+ wxWindow *parent = m_winParent->IsTopLevel() ? NULL
+ : m_winParent->GetParent();
// the event is propagated downwards if the event emitter was our parent
bool goingDown = event.GetEventObject() == parent;
{
// 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();
if ( winFocus )
{
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && wxUSE_RADIOBTN
// If we are in a radio button group, start from the first item in the
// group
if ( event.IsFromTab() && wxIsKindOf(winFocus, wxRadioButton ) )
winFocus = wxGetFirstButtonInGroup((wxRadioButton*)winFocus);
-#endif
+#endif // __WXMSW__
// ok, we found the focus - now is it our child?
start_node = children.Find( winFocus );
}
// 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();
}
wxWindow *child = node->GetData();
-#ifdef __WXMSW__
+ // don't TAB to another TLW
+ if ( child->IsTopLevel() )
+ {
+ node = forward ? node->GetNext() : node->GetPrevious();
+
+ continue;
+ }
+
+#if defined(__WXMSW__) && wxUSE_RADIOBTN
if ( event.IsFromTab() )
{
if ( wxIsKindOf(child, wxRadioButton) )
wxIsKindOf(m_winLastFocused, wxRadioButton) &&
!m_winLastFocused->HasFlag(wxRB_SINGLE) )
{
+ wxRadioButton * const
+ lastBtn = static_cast<wxRadioButton *>(m_winLastFocused);
+
// cursor keys don't navigate out of a radio button group so
// find the correct radio button to focus
if ( forward )
{
- child = wxGetNextButtonInGroup((wxRadioButton*)m_winLastFocused);
+ child = wxGetNextButtonInGroup(lastBtn);
if ( !child )
{
// no next button in group, set it to the first button
- child = wxGetFirstButtonInGroup((wxRadioButton*)m_winLastFocused);
+ child = wxGetFirstButtonInGroup(lastBtn);
}
}
else
{
- child = wxGetPreviousButtonInGroup((wxRadioButton*)m_winLastFocused);
+ child = wxGetPreviousButtonInGroup(lastBtn);
if ( !child )
{
// no previous button in group, set it to the last button
- child = wxGetLastButtonInGroup((wxRadioButton*)m_winLastFocused);
+ child = wxGetLastButtonInGroup(lastBtn);
}
}
// focus handling
// ----------------------------------------------------------------------------
-bool wxControlContainer::DoSetFocus()
-{
- wxLogTrace(TRACE_FOCUS, _T("SetFocus on wxPanel 0x%p."),
- m_winParent->GetHandle());
-
- if (m_inSetFocus)
- return true;
-
- // 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() )
- {
- // don't look beyond the first top level parent - useless and
- // unnecessary
- break;
- }
-
- win = win->GetParent();
- }
-
- // protect against infinite recursion:
- m_inSetFocus = true;
-
- bool ret = SetFocusToChild();
-
- m_inSetFocus = false;
-
- return ret;
-}
-
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() );
event.Skip();
}
+
+#else
+ // wxHAS_NATIVE_TAB_TRAVERSAL
+
bool wxControlContainer::SetFocusToChild()
{
- return wxSetFocusToChild(m_winParent, &m_winLastFocused);
+ return wxSetFocusToChild(m_winParent, NULL);
}
+
+#endif // !wxHAS_NATIVE_TAB_TRAVERSAL
+
// ----------------------------------------------------------------------------
// SetFocusToChild(): this function is used by wxPanel but also by wxFrame in
// wxMSW, this is why it is outside of wxControlContainer class
bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
{
- wxCHECK_MSG( win, false, _T("wxSetFocusToChild(): invalid window") );
- wxCHECK_MSG( childLastFocused, false,
- _T("wxSetFocusToChild(): NULL child poonter") );
+ wxCHECK_MSG( win, false, wxT("wxSetFocusToChild(): invalid window") );
+ // wxCHECK_MSG( childLastFocused, false,
+ // wxT("wxSetFocusToChild(): NULL child poonter") );
- if ( *childLastFocused )
+ 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, in this
+ // case focus its parent instead.
+ while ( !(*childLastFocused)->IsShown() )
+ {
+ *childLastFocused = (*childLastFocused)->GetParent();
+ if ( !*childLastFocused )
+ break;
+ }
- // 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;
+ if ( *childLastFocused )
+ {
+ 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;
}
}
if ( child->CanAcceptFocusFromKeyboard() && !child->IsTopLevel() )
{
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && wxUSE_RADIOBTN
// If a radiobutton is the first focusable child, search for the
// selected radiobutton in the same group
wxRadioButton* btn = wxDynamicCast(child, wxRadioButton);
if (selected)
child = selected;
}
-#endif
+#endif // __WXMSW__
wxLogTrace(TRACE_FOCUS,
- _T("SetFocusToChild() => first child (0x%p)."),
+ wxT("SetFocusToChild() => first child (0x%p)."),
child->GetHandle());
- *childLastFocused = child;
+ if (childLastFocused)
+ *childLastFocused = child;
child->SetFocusFromKbd();
return true;
}
return false;
}
-#endif // !wxHAS_NATIVE_TAB_TRAVERSAL
projects / wxWidgets.git / blobdiff