Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Really add items to the listbox in wxQt wxListBox::Create()

Browse Source 
The initial choices were just ignored, do add them to the Qt listbox
now.

Closes https://github.com/wxWidgets/wxWidgets/pull/1094
This commit is contained in:
chris2oph
2018-12-20 15:49:51 +00:00
committed by Vadim Zeitlin
parent e9cbbede00
commit a6dc3c78ab
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/listbox.cpp
View File

@@ -111,7 +111,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
bool wxListBox::Create(wxWindow *parent, wxWindowID id, bool wxListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& WXUNUSED(choices), const wxArrayString& choices,
long style, long style,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
@@ -119,6 +119,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
Init(); Init();
m_qtWindow = m_qtListWidget = new wxQtListWidget( parent, this ); m_qtWindow = m_qtListWidget = new wxQtListWidget( parent, this );
QStringList items;
for (size_t i = 0; i < choices.size(); ++i)
items.push_back(wxQtConvertString(choices[i]));
m_qtListWidget->addItems(items);
return wxListBoxBase::Create( parent, id, pos, size, style, validator, name ); return wxListBoxBase::Create( parent, id, pos, size, style, validator, name );
} }