[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / univ / radiobox.cpp

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 9fadd8eb266c44ebdcf72dd0a2c1f31b01a3c3c7..bb6aa6eda12af41d954e51e2b39cacf99f81c21a 100644 (file)
--- 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;