X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4055ed8281971e3d35bf04177193c27043d42ed1..2fb18bf45bcf391a8eb973886072dc67893e9bbe:/src/common/containr.cpp diff --git a/src/common/containr.cpp b/src/common/containr.cpp index 8b62297a92..72f8634104 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "containr.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -44,6 +40,9 @@ #include "wx/radiobut.h" #endif +// trace mask for focus messages +#define TRACE_FOCUS _T("focus") + // ============================================================================ // implementation // ============================================================================ @@ -133,13 +132,13 @@ void wxControlContainer::SetLastFocus(wxWindow *win) if ( win ) { - wxLogTrace(_T("focus"), _T("Set last focus to %s(%s)"), + wxLogTrace(TRACE_FOCUS, _T("Set last focus to %s(%s)"), win->GetClassInfo()->GetClassName(), win->GetLabel().c_str()); } else { - wxLogTrace(_T("focus"), _T("No more last focus")); + wxLogTrace(TRACE_FOCUS, _T("No more last focus")); } } @@ -153,6 +152,111 @@ void wxControlContainer::SetLastFocus(wxWindow *win) } } +// -------------------------------------------------------------------- +// The following four functions are used to find other radio buttons +// within the same group. Used by wxSetFocusToChild on wxMSW +// -------------------------------------------------------------------- + +#ifdef __WXMSW__ + +wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn) +{ + if ( btn->HasFlag(wxRB_GROUP) || btn->HasFlag(wxRB_SINGLE) ) + return NULL; + + 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?") ); + + // Iterate over all previous siblings until we find the next radio button + wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious(); + wxRadioButton *prevBtn = 0; + while (nodeBefore) + { + prevBtn = wxDynamicCast(nodeBefore->GetData(), wxRadioButton); + if (prevBtn) + break; + + nodeBefore = nodeBefore->GetPrevious(); + } + + if (!prevBtn || prevBtn->HasFlag(wxRB_SINGLE)) + { + // no more buttons in group + return NULL; + } + else + return prevBtn; +} + +wxRadioButton* wxGetNextButtonInGroup(wxRadioButton *btn) +{ + if (btn->HasFlag(wxRB_SINGLE)) + return NULL; + + 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?") ); + + // Iterate over all previous siblings until we find the next radio button + wxWindowList::compatibility_iterator nodeNext = nodeThis->GetNext(); + wxRadioButton *nextBtn = 0; + while (nodeNext) + { + nextBtn = wxDynamicCast(nodeNext->GetData(), wxRadioButton); + if (nextBtn) + break; + + nodeNext = nodeNext->GetNext(); + } + + if ( !nextBtn || nextBtn->HasFlag(wxRB_GROUP) || nextBtn->HasFlag(wxRB_SINGLE) ) + { + // no more buttons or the first button of the next group + return NULL; + } + else + return nextBtn; +} + +wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn) +{ + while (true) + { + wxRadioButton* prevBtn = wxGetPreviousButtonInGroup(btn); + if (!prevBtn) + return btn; + + btn = prevBtn; + } +} + +wxRadioButton* wxGetSelectedButtonInGroup(wxRadioButton *btn) +{ + // Find currently selected button + if (btn->GetValue()) + return btn; + + if (btn->HasFlag(wxRB_SINGLE)) + return NULL; + + wxRadioButton *selBtn; + + // First check all previous buttons + for (selBtn = wxGetPreviousButtonInGroup(btn); selBtn; selBtn = wxGetPreviousButtonInGroup(selBtn)) + if (selBtn->GetValue()) + return selBtn; + + // Now all following buttons + for (selBtn = wxGetNextButtonInGroup(btn); selBtn; selBtn = wxGetNextButtonInGroup(selBtn)) + if (selBtn->GetValue()) + return selBtn; + + return NULL; +} + +#endif // __WXMSW__ + // ---------------------------------------------------------------------------- // Keyboard handling - this is the place where the TAB traversal logic is // implemented. As this code is common to all ports, this ensures consistent @@ -224,6 +328,12 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) if ( winFocus ) { +#ifdef __WXMSW__ + // 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 // ok, we found the focus - now is it our child? start_node = children.Find( winFocus ); } @@ -291,14 +401,40 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) wxWindow *child = node->GetData(); -#if defined(__WXMSW__) && !defined(__WXPALMOS__) - bool is_not_msw_rb = !m_winLastFocused || - !wxIsKindOf(m_winLastFocused,wxRadioButton); +#ifdef __WXMSW__ + bool canSelectRadioButton = true; + if (!event.IsFromTab()) + { + // If navigating using cursor keys, make sure not to navigate out of a radio button group. + if (m_winLastFocused && wxIsKindOf(m_winLastFocused, wxRadioButton)) + { + if (!wxIsKindOf(child, wxRadioButton)) + { + child = forward ? + wxGetNextButtonInGroup((wxRadioButton*)m_winLastFocused) : + wxGetPreviousButtonInGroup((wxRadioButton*)m_winLastFocused); + if (!child) + { + event.Skip(false); + return; + } + } + } + } + else + { + // If navigating using tabs, skip all but the first radio button in a group. + if (wxIsKindOf(child, wxRadioButton)) + { + if (wxGetPreviousButtonInGroup((wxRadioButton*)child)) + canSelectRadioButton = false; + } + } #else - static const bool is_not_msw_rb = true; + static bool canSelectRadioButton = true; #endif - if ( child->AcceptsFocusFromKeyboard() && is_not_msw_rb ) + if ( child->AcceptsFocusFromKeyboard() && canSelectRadioButton ) { // if we're setting the focus to a child panel we should prevent it // from giving it to the child which had the focus the last time @@ -306,32 +442,15 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // direction we're coming event.SetEventObject(m_winParent); -#if defined(__WXMSW__) && !defined(__WXPALMOS__) +#if defined(__WXMSW__) // we need to hop to the next activated // radio button, not just the next radio // button under MSW - if (wxIsKindOf(child,wxRadioButton)) + if (wxIsKindOf(child, wxRadioButton) && event.IsFromTab()) { - wxRadioButton *rb = (wxRadioButton*) child; - if (!rb->GetValue()) - { - for (;;) - { - wxWindowList::compatibility_iterator node = children.Find( child ); - if (forward) - node = node->GetNext(); - else - node = node->GetPrevious(); - if (!node) - return; // this would probably an error - child = node->GetData(); - if (!wxIsKindOf(child,wxRadioButton)) - continue; - rb = (wxRadioButton*) child; - if (rb->GetValue()) - break; - } - } + wxRadioButton *rb = wxGetSelectedButtonInGroup((wxRadioButton*)child); + if (rb) + child = rb; } #endif // __WXMSW__ @@ -380,8 +499,8 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child) bool wxControlContainer::DoSetFocus() { - wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."), - (unsigned long)m_winParent->GetHandle()); + wxLogTrace(TRACE_FOCUS, _T("SetFocus on wxPanel 0x%p."), + m_winParent->GetHandle()); if (m_inSetFocus) return true; @@ -421,8 +540,8 @@ bool wxControlContainer::DoSetFocus() void wxControlContainer::HandleOnFocus(wxFocusEvent& event) { - wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08lx, name: %s"), - (unsigned long)m_winParent->GetHandle(), + wxLogTrace(TRACE_FOCUS, _T("OnFocus on wxPanel 0x%p, name: %s"), + m_winParent->GetHandle(), m_winParent->GetName().c_str() ); DoSetFocus(); @@ -451,9 +570,9 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) // It might happen that the window got reparented if ( (*childLastFocused)->GetParent() == win ) { - wxLogTrace(_T("focus"), - _T("SetFocusToChild() => last child (0x%08lx)."), - (unsigned long)(*childLastFocused)->GetHandle()); + wxLogTrace(TRACE_FOCUS, + _T("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 @@ -475,9 +594,21 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() ) { - wxLogTrace(_T("focus"), - _T("SetFocusToChild() => first child (0x%08lx)."), - (unsigned long)child->GetHandle()); +#ifdef __WXMSW__ + // If a radiobutton is the first focusable child, search for the + // selected radiobutton in the same group + wxRadioButton* btn = wxDynamicCast(child, wxRadioButton); + if (btn) + { + wxRadioButton* selected = wxGetSelectedButtonInGroup(btn); + if (selected) + child = selected; + } +#endif + + wxLogTrace(TRACE_FOCUS, + _T("SetFocusToChild() => first child (0x%p)."), + child->GetHandle()); *childLastFocused = child; child->SetFocusFromKbd();