X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c266945cab18b6f34286235f2950970575259339..1d39da4b229f228045c0aa6722665d42d5db61b8:/src/motif/checklst.cpp diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp index 54e230848e..b86a9863bd 100644 --- a/src/motif/checklst.cpp +++ b/src/motif/checklst.cpp @@ -20,6 +20,7 @@ #include "wx/defs.h" #include "wx/checklst.h" +#include "wx/arrstr.h" // ============================================================================ // implementation @@ -57,16 +58,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 +83,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; }