X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c16e6df8e49ea69a4b123e5c4de96e97aa1dce6..7f8c0d74d7025b6c677fbd88890ea10d302ef3d5:/src/univ/radiobox.cpp?ds=inline diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp index ba7e54ab97..9fadd8eb26 100644 --- a/src/univ/radiobox.cpp +++ b/src/univ/radiobox.cpp @@ -112,7 +112,7 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, Init(); - (void)Create(parent, id, title, pos, size, chs.GetCount(), + (void)Create(parent, id, title, pos, size, chs.GetCount(), chs.GetStrings(), majorDim, style, val, name); } @@ -129,7 +129,7 @@ bool wxRadioBox::Create(wxWindow *parent, { wxCArrayString chs(choices); - return Create(parent, id, title, pos, size, chs.GetCount(), + return Create(parent, id, title, pos, size, chs.GetCount(), chs.GetStrings(), majorDim, style, val, name); } @@ -309,7 +309,7 @@ void wxRadioBox::OnRadioButton(wxEvent& event) wxString wxRadioBox::GetString(int n) const { - wxCHECK_MSG( IsValid(n), _T(""), + wxCHECK_MSG( IsValid(n), wxEmptyString, _T("invalid index in wxRadioBox::GetString") ); return m_buttons[n]->GetLabel(); @@ -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(0,0); + wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(); x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x; y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;