merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -57,16 +57,6 @@ static void CopyStringsAddingPrefix(const wxArrayString& orig,
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
wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase()
{
@@ -92,10 +82,9 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator,
const wxString& name)
{
wxString* chs = CopyStringsAddingPrefix(n, choices);
bool retVal = wxListBox::Create(parent, id, pos, size, n, chs,
// wxListBox::Create calls set, which adds the prefixes
bool retVal = wxListBox::Create(parent, id, pos, size, n, choices,
style, validator, name);
delete[] chs;
return retVal;
}