trying to resolve GSocketManager API mess: the meaning of Install/Uninstall_Callback...

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 8f41d782f2f2848311b3a96ae062f70f900d9558..06ada8e7a298b42c4d224ad8b48cb1052c7dd19f 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -533,7 +533,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
                   !m_winLastFocused->HasFlag(wxRB_SINGLE) )
         {
             wxRadioButton * const
                   !m_winLastFocused->HasFlag(wxRB_SINGLE) )
         {
             wxRadioButton * const

-                lastBtn = wx_static_cast(wxRadioButton *, m_winLastFocused);
+                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
 
             // cursor keys don't navigate out of a radio button group so
             // find the correct radio button to focus


@@ -566,7 +566,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
         }
 #endif // __WXMSW__
 
         }
 #endif // __WXMSW__
 

-        if ( child->CanAcceptFocus() )
+        if ( child->CanAcceptFocusFromKeyboard() )

         {
             // 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
         {
             // 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