AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fix after last patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-02-20 00:45:10 +00:00
parent 68350608bc
commit b49f58fe12
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/containr.cpp
View File

@ -154,7 +154,7 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
} }
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// The following four functions are used to find other radio buttons // The following four functions are used to find other radio buttons
// within the same group. Used by wxSetFocusToChild on wxMSW // within the same group. Used by wxSetFocusToChild on wxMSW
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@ -180,7 +180,7 @@ wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn)
nodeBefore = nodeBefore->GetPrevious(); nodeBefore = nodeBefore->GetPrevious();
} }
if (!prevBtn || prevBtn->HasFlag(wxRB_SINGLE)) if (!prevBtn || prevBtn->HasFlag(wxRB_SINGLE))
{ {
// no more buttons in group // no more buttons in group
@ -227,7 +227,7 @@ wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn)
wxRadioButton* prevBtn = wxGetPreviousButtonInGroup(btn); wxRadioButton* prevBtn = wxGetPreviousButtonInGroup(btn);
if (!prevBtn) if (!prevBtn)
return btn; return btn;
btn = prevBtn; btn = prevBtn;
} }
} }
@ -256,7 +256,7 @@ wxRadioButton* wxGetSelectedButtonInGroup(wxRadioButton *btn)
return NULL; return NULL;
} }
#endif __WXMSW__ #endif // __WXMSW__
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Keyboard handling - this is the place where the TAB traversal logic is // Keyboard handling - this is the place where the TAB traversal logic is
@ -330,7 +330,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
if ( winFocus ) if ( winFocus )
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
// If we are in a radio button group, start from the first item in the // If we are in a radio button group, start from the first item in the
// group // group
if ( event.IsFromTab() && wxIsKindOf(winFocus, wxRadioButton ) ) if ( event.IsFromTab() && wxIsKindOf(winFocus, wxRadioButton ) )
winFocus = wxGetFirstButtonInGroup((wxRadioButton*)winFocus); winFocus = wxGetFirstButtonInGroup((wxRadioButton*)winFocus);
@ -411,8 +411,8 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
{ {
if (!wxIsKindOf(child, wxRadioButton)) if (!wxIsKindOf(child, wxRadioButton))
{ {
child = forward ? child = forward ?
wxGetNextButtonInGroup((wxRadioButton*)m_winLastFocused) : wxGetNextButtonInGroup((wxRadioButton*)m_winLastFocused) :
wxGetPreviousButtonInGroup((wxRadioButton*)m_winLastFocused); wxGetPreviousButtonInGroup((wxRadioButton*)m_winLastFocused);
if (!child) if (!child)
{ {
@ -596,7 +596,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() ) if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() )
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
// If a radiobutton is the first focusable child, search for the // If a radiobutton is the first focusable child, search for the
// selected radiobutton in the same group // selected radiobutton in the same group
wxRadioButton* btn = wxDynamicCast(child, wxRadioButton); wxRadioButton* btn = wxDynamicCast(child, wxRadioButton);
if (btn) if (btn)