return false;
}
+bool wxControlContainerBase::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;
+}
+
+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)
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();
wxWindow *child = node->GetData();
+ // don't TAB to another TLW
+ if ( child->IsTopLevel() )
+ {
+ node = forward ? node->GetNext() : node->GetPrevious();
+
+ continue;
+ }
+
#if defined(__WXMSW__) && wxUSE_RADIOBTN
if ( event.IsFromTab() )
{
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"),
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( childLastFocused, false,
+ // _T("wxSetFocusToChild(): NULL child poonter") );
- if ( *childLastFocused )
+ if ( childLastFocused && *childLastFocused )
{
// It might happen that the window got reparented
if ( (*childLastFocused)->GetParent() == win )
else
{
// it doesn't count as such any more
- *childLastFocused = (wxWindow *)NULL;
+ *childLastFocused = NULL;
}
}
_T("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