X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b5d5223d164a3b7fbacc5e69808cadd25163b1b..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/univ/radiobox.cpp diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp index 9fadd8eb26..bb6aa6eda1 100644 --- a/src/univ/radiobox.cpp +++ b/src/univ/radiobox.cpp @@ -322,18 +322,18 @@ void wxRadioBox::SetString(int n, const wxString& label) m_buttons[n]->SetLabel(label); } -void wxRadioBox::Enable(int n, bool enable) +bool wxRadioBox::Enable(int n, bool enable) { - wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Enable") ); + wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Enable") ); - m_buttons[n]->Enable(enable); + return m_buttons[n]->Enable(enable); } -void wxRadioBox::Show(int n, bool show) +bool wxRadioBox::Show(int n, bool show) { - wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Show") ); + wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Show") ); - m_buttons[n]->Show(show); + return m_buttons[n]->Show(show); } // ---------------------------------------------------------------------------- @@ -445,7 +445,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height) wxSize sizeBtn = GetMaxButtonSize(); wxPoint ptOrigin = GetBoxAreaOrigin(); - wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(); + wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0); x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x; y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;