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

Fix inserting items into unsorted wxBitmapComboBox.

Browse Source 
When wxBitmapComboBox::DoInsertItems() is called from
wxBitmapComboBox::RecreateControl() then the existing bitmap array should be
reused and new bitmaps shouldn't be allocated.

Closes https://github.com/wxWidgets/wxWidgets/pull/71
This commit is contained in:
Artur Wieczorek 2015-08-12 18:43:43 +02:00 committed by Vadim Zeitlin
parent 8a2239e409
commit 79aea3a9a2
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/bmpcbox.cpp
View File

@ -360,16 +360,33 @@ int wxBitmapComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
} }
else else
{ {
const unsigned int countNew = GetCount() + numItems; if ( GetCount() == m_bitmaps.Count() )
m_bitmaps.Alloc(countNew);
for ( unsigned int i = 0; i < numItems; i++ )
{ {
m_bitmaps.Insert(new wxBitmap(wxNullBitmap), pos + i); // Control is in the normal state.
// Just insert new bitmaps into the array.
const unsigned int countNew = GetCount() + numItems;
m_bitmaps.Alloc(countNew);
for ( unsigned int i = 0; i < numItems; i++ )
{
m_bitmaps.Insert(new wxBitmap(wxNullBitmap), pos + i);
}
}
else
{
wxASSERT_MSG( GetCount() < m_bitmaps.Count(),
wxS("Invalid wxBitmapComboBox state") );
// There are less items then bitmaps.
// (This can happen if control is e.g. recreated with RecreateControl).
// In this case existing bitmaps are reused.
// The whole block of inserted items should be within the range
// of indices of the existing bitmap array.
wxASSERT_MSG( pos + numItems <= m_bitmaps.Count(),
wxS("wxBitmapComboBox item index out of bound") );
} }
index = wxComboBox::DoInsertItems(items, pos, clientData, type); index = wxComboBox::DoInsertItems(items, pos,
clientData, type);
// This returns index of the last item in the inserted block. // This returns index of the last item in the inserted block.
if ( index == wxNOT_FOUND ) if ( index == wxNOT_FOUND )