move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

[wxWidgets.git] / src / common / containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index dfb7a123d86a1272de12365436e8c4cdc2d0a4d9..535513d54d18f6b6698f47f742e2ae792c0b01fb 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -40,6 +40,10 @@
     #include "wx/scrolbar.h"
 #endif
 
     #include "wx/scrolbar.h"
 #endif
 

+#ifdef __WXMSW__
+    #include "wx/radiobut.h"
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -51,6 +55,7 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
     m_winLastFocused =
     m_winTmpDefault =
     m_winDefault = NULL;
     m_winLastFocused =
     m_winTmpDefault =
     m_winDefault = NULL;

+    m_inSetFocus = false;

 }
 
 bool wxControlContainer::AcceptsFocus() const
 }
 
 bool wxControlContainer::AcceptsFocus() const


@@ -63,21 +68,21 @@ bool wxControlContainer::AcceptsFocus() const
         // at least one child will accept focus
         wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst();
         if ( !node )
         // at least one child will accept focus
         wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst();
         if ( !node )

-            return TRUE;
+            return true;

 
 #ifdef __WXMAC__
         // wxMac has eventually the two scrollbars as children, they don't count
         // as real children in the algorithm mentioned above
         bool hasRealChildren = false ;
 #endif
 
 #ifdef __WXMAC__
         // wxMac has eventually the two scrollbars as children, they don't count
         // as real children in the algorithm mentioned above
         bool hasRealChildren = false ;
 #endif

-        
+

         while ( node )
         {
             wxWindow *child = node->GetData();
 
             if ( child->AcceptsFocus() )
             {
         while ( node )
         {
             wxWindow *child = node->GetData();
 
             if ( child->AcceptsFocus() )
             {

-                return TRUE;
+                return true;

             }
 
 #ifdef __WXMAC__
             }
 
 #ifdef __WXMAC__


@@ -87,14 +92,14 @@ bool wxControlContainer::AcceptsFocus() const
 #endif
             node = node->GetNext();
         }
 #endif
             node = node->GetNext();
         }

-        
+

 #ifdef __WXMAC__
         if ( !hasRealChildren )
 #ifdef __WXMAC__
         if ( !hasRealChildren )

-            return TRUE ;
+            return true ;

 #endif
     }
 
 #endif
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 }
 
 void wxControlContainer::SetLastFocus(wxWindow *win)


@@ -148,6 +153,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
 // ----------------------------------------------------------------------------
 // Keyboard handling - this is the place where the TAB traversal logic is
 // implemented. As this code is common to all ports, this ensures consistent


@@ -219,6 +329,12 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
 
         if ( winFocus )
         {
 
         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 );
         }
             // ok, we found the focus - now is it our child?
             start_node = children.Find( winFocus );
         }


@@ -286,13 +402,62 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
 
         wxWindow *child = node->GetData();
 
 
         wxWindow *child = node->GetData();
 

-        if ( child->AcceptsFocusFromKeyboard() )
+#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 bool canSelectRadioButton = true;
+#endif
+
+        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
             // and instead give it to the first/last child depending from which
             // direction we're coming
             event.SetEventObject(m_winParent);
         {
             // 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
             // and instead give it to the first/last child depending from which
             // direction we're coming
             event.SetEventObject(m_winParent);

+
+#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) && event.IsFromTab())
+            {
+                wxRadioButton *rb = wxGetSelectedButtonInGroup((wxRadioButton*)child);
+                if (rb)
+                    child = rb;
+            }
+#endif // __WXMSW__
+
+            // disable propagation for this call as otherwise the event might
+            // bounce back to us.
+            wxPropagationDisabler disableProp(event);

             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // set it first in case SetFocusFromKbd() results in focus
             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // set it first in case SetFocusFromKbd() results in focus


@@ -304,7 +469,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
             }
             //else: the child manages its focus itself
 
             }
             //else: the child manages its focus itself
 

-            event.Skip( FALSE );
+            event.Skip( false );

 
             return;
         }
 
             return;
         }


@@ -338,6 +503,9 @@ bool wxControlContainer::DoSetFocus()
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
                (unsigned long)m_winParent->GetHandle());
 
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
                (unsigned long)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
     // 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


@@ -348,7 +516,7 @@ bool wxControlContainer::DoSetFocus()
         if ( win == m_winParent )
         {
             // our child already has focus, don't take it away from it
         if ( win == m_winParent )
         {
             // our child already has focus, don't take it away from it

-            return TRUE;
+            return true;

         }
 
         if ( win->IsTopLevel() )
         }
 
         if ( win->IsTopLevel() )


@@ -361,7 +529,14 @@ bool wxControlContainer::DoSetFocus()
         win = win->GetParent();
     }
 
         win = win->GetParent();
     }
 

-    return SetFocusToChild();
+    // protect against infinite recursion:
+    m_inSetFocus = true;
+
+    bool ret = SetFocusToChild();
+
+    m_inSetFocus = false;
+
+    return ret;

 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)


@@ -387,8 +562,8 @@ bool wxControlContainer::SetFocusToChild()
 
 bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 {
 
 bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 {

-    wxCHECK_MSG( win, FALSE, _T("wxSetFocusToChild(): invalid window") );
-    wxCHECK_MSG( childLastFocused, FALSE,
+    wxCHECK_MSG( win, false, _T("wxSetFocusToChild(): invalid window") );
+    wxCHECK_MSG( childLastFocused, false,

                  _T("wxSetFocusToChild(): NULL child poonter") );
 
     if ( *childLastFocused )
                  _T("wxSetFocusToChild(): NULL child poonter") );
 
     if ( *childLastFocused )


@@ -403,7 +578,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
             // not SetFocusFromKbd(): we're restoring focus back to the old
             // window and not setting it as the result of a kbd action
             (*childLastFocused)->SetFocus();
             // 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;
+            return true;

         }
         else
         {
         }
         else
         {


@@ -420,18 +595,30 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 
         if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() )
         {
 
         if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() )
         {

+#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(_T("focus"),
                        _T("SetFocusToChild() => first child (0x%08lx)."),
                        (unsigned long)child->GetHandle());
 
             *childLastFocused = child;
             child->SetFocusFromKbd();
             wxLogTrace(_T("focus"),
                        _T("SetFocusToChild() => first child (0x%08lx)."),
                        (unsigned long)child->GetHandle());
 
             *childLastFocused = child;
             child->SetFocusFromKbd();

-            return TRUE;
+            return true;

         }
 
         node = node->GetNext();
     }
 
         }
 
         node = node->GetNext();
     }
 

-    return FALSE;
+    return false;

 }
 
 }