Added some missing STL-like wxArray/wxArrayString constructors.
Added helper class wxCArrayString, better replacement for wxArrayString::GetStringArray. Added overloaded constructors and Create() methods taking a wxArrayString for wxCheckListBox, wxChoice, wxComboBox, wxListBox, wxRadioBox, wxSingleChoiceDialog, wxMultipleChoiceDialog. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1398,20 +1398,11 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent,
|
||||
wxWindowID id,
|
||||
wxEvtHandler* evtHandler)
|
||||
{
|
||||
size_t count = m_choices.GetCount();
|
||||
wxString *choices = new wxString[count];
|
||||
for ( size_t n = 0; n < count; n++ )
|
||||
{
|
||||
choices[n] = m_choices[n];
|
||||
}
|
||||
|
||||
m_control = new wxComboBox(parent, id, wxEmptyString,
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
count, choices,
|
||||
m_choices,
|
||||
m_allowOthers ? 0 : wxCB_READONLY);
|
||||
|
||||
delete [] choices;
|
||||
|
||||
wxGridCellEditor::Create(parent, id, evtHandler);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user