Don't add checkbox characters ("[ ] ") twice.
Remove now unused function. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -57,16 +57,6 @@ static void CopyStringsAddingPrefix(const wxArrayString& orig,
|
|||||||
copy.Add( Prefix(FALSE) + orig[i] );
|
copy.Add( Prefix(FALSE) + orig[i] );
|
||||||
}
|
}
|
||||||
|
|
||||||
static wxString* CopyStringsAddingPrefix(size_t n, const wxString choices[])
|
|
||||||
{
|
|
||||||
wxString* copy = new wxString[n];
|
|
||||||
|
|
||||||
for(size_t i = 0; i < n; ++i )
|
|
||||||
copy[i] = Prefix(FALSE) + choices[i];
|
|
||||||
|
|
||||||
return copy;
|
|
||||||
}
|
|
||||||
|
|
||||||
// def ctor: use Create() to really create the control
|
// def ctor: use Create() to really create the control
|
||||||
wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase()
|
wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase()
|
||||||
{
|
{
|
||||||
@@ -92,10 +82,9 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
const wxValidator& validator,
|
const wxValidator& validator,
|
||||||
const wxString& name)
|
const wxString& name)
|
||||||
{
|
{
|
||||||
wxString* chs = CopyStringsAddingPrefix(n, choices);
|
// wxListBox::Create calls set, which adds the prefixes
|
||||||
bool retVal = wxListBox::Create(parent, id, pos, size, n, chs,
|
bool retVal = wxListBox::Create(parent, id, pos, size, n, choices,
|
||||||
style, validator, name);
|
style, validator, name);
|
||||||
delete[] chs;
|
|
||||||
return retVal;
|
return retVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user