// 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"
#include "wx/log.h"
#include "wx/event.h"
#include "wx/window.h"
-#endif //WX_PRECOMP
-
-#include "wx/containr.h"
-
-#ifdef __WXMAC__
#include "wx/scrolbar.h"
-#endif
-
-#ifdef __WXMSW__
#include "wx/radiobut.h"
-#endif
+ #include "wx/containr.h"
+#endif //WX_PRECOMP
+
+// trace mask for focus messages
+#define TRACE_FOCUS _T("focus")
// ============================================================================
// implementation
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"));
}
}
}
}
+// --------------------------------------------------------------------
+// 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;
+ }
+
+ 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;
+ }
+
+ return nextBtn;
+}
+
+wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn)
+{
+ while (true)
+ {
+ wxRadioButton* prevBtn = wxGetPreviousButtonInGroup(btn);
+ if (!prevBtn)
+ return btn;
+
+ btn = prevBtn;
+ }
+}
+
+wxRadioButton* wxGetLastButtonInGroup(wxRadioButton *btn)
+{
+ while (true)
+ {
+ wxRadioButton* nextBtn = wxGetNextButtonInGroup(btn);
+ if (!nextBtn)
+ return btn;
+
+ btn = nextBtn;
+ }
+}
+
+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
}
// where are we going?
- bool forward = event.GetDirection();
+ const bool forward = event.GetDirection();
// the node of the children list from which we should start looking for the
// next acceptable child
// start from first or last depending on where we're going
node = forward ? children.GetFirst() : children.GetLast();
-
- // we want to cycle over all nodes
- start_node = wxWindowList::compatibility_iterator();
}
- else
+ else // going up
{
// try to find the child which has the focus currently
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 );
}
- else
- {
- start_node = wxWindowList::compatibility_iterator();
- }
if ( !start_node && m_winLastFocused )
{
}
// we want to cycle over all elements passing by NULL
- while ( node != start_node )
+ for ( ;; )
{
+ // don't go into infinite loop
+ if ( start_node && node && node == start_node )
+ break;
+
// Have we come to the last or first item on the panel?
if ( !node )
{
+ if ( !start_node )
+ {
+ // exit now as otherwise we'd loop forever
+ break;
+ }
+
if ( !goingDown )
{
- // Check if our (may be grand) parent is another panel: if this
+ // Check if our (maybe grand) parent is another panel: if this
// is the case, they will know what to do with this navigation
// key and so give them the chance to process it instead of
// looping inside this panel (normally, the focus will go to
wxWindow *child = node->GetData();
-#if defined(__WXMSW__) && !defined(__PALMOS__)
- bool is_not_msw_rb = !m_winLastFocused ||
- !wxIsKindOf(m_winLastFocused,wxRadioButton);
-#else
- static const bool is_not_msw_rb = true;
-#endif
+#ifdef __WXMSW__
+ if ( event.IsFromTab() )
+ {
+ if ( wxIsKindOf(child, wxRadioButton) )
+ {
+ // only radio buttons with either wxRB_GROUP or wxRB_SINGLE
+ // can be tabbed to
+ if ( child->HasFlag(wxRB_GROUP) )
+ {
+ // need to tab into the active button within a group
+ wxRadioButton *rb = wxGetSelectedButtonInGroup((wxRadioButton*)child);
+ if ( rb )
+ child = rb;
+ }
+ else if ( !child->HasFlag(wxRB_SINGLE) )
+ {
+ node = forward ? node->GetNext() : node->GetPrevious();
+ continue;
+ }
+ }
+ }
+ else if ( m_winLastFocused &&
+ wxIsKindOf(m_winLastFocused, wxRadioButton) &&
+ !m_winLastFocused->HasFlag(wxRB_SINGLE) )
+ {
+ // 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);
+ if ( !child )
+ {
+ // no next button in group, set it to the first button
+ child = wxGetFirstButtonInGroup((wxRadioButton*)m_winLastFocused);
+ }
+ }
+ else
+ {
+ child = wxGetPreviousButtonInGroup((wxRadioButton*)m_winLastFocused);
+ if ( !child )
+ {
+ // no previous button in group, set it to the last button
+ child = wxGetLastButtonInGroup((wxRadioButton*)m_winLastFocused);
+ }
+ }
- if ( child->AcceptsFocusFromKeyboard() && is_not_msw_rb )
+ if ( child == m_winLastFocused )
+ {
+ // must be a group consisting of only one button therefore
+ // no need to send a navigation event
+ event.Skip(false);
+ return;
+ }
+ }
+#endif // __WXMSW__
+
+ if ( child->AcceptsFocusFromKeyboard() )
{
// 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
// direction we're coming
event.SetEventObject(m_winParent);
-#if defined(__WXMSW__) && !defined(__PALMOS__)
- // we need to hop to the next activated
- // radio button, not just the next radio
- // button under MSW
- if (wxIsKindOf(child,wxRadioButton))
- {
- 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;
- }
- }
- }
-#endif // __WXMSW__
-
// disable propagation for this call as otherwise the event might
// bounce back to us.
wxPropagationDisabler disableProp(event);
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;
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();
// 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
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();
return false;
}
-
projects / wxWidgets.git / blobdiff