Fixed problem in InsertItems of always adding ownerdraw data even when

not an ownerdrawn listbox.  If some items were already appended then
the indexes would not match.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2002-05-03 22:31:21 +00:00
parent 27af32803a
commit 9085d634d9

View File

@ -516,12 +516,15 @@ wxListBox::DoInsertItems(const wxArrayString& items, int pos)
int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i]);
#if wxUSE_OWNER_DRAWN
wxOwnerDrawn *pNewItem = CreateItem(idx);
pNewItem->SetName(items[i]);
pNewItem->SetFont(GetFont());
m_aItems.Insert(pNewItem, idx);
if ( m_windowStyle & wxLB_OWNERDRAW )
{
wxOwnerDrawn *pNewItem = CreateItem(idx);
pNewItem->SetName(items[i]);
pNewItem->SetFont(GetFont());
m_aItems.Insert(pNewItem, idx);
ListBox_SetItemData(GetHwnd(), idx, pNewItem);
ListBox_SetItemData(GetHwnd(), idx, pNewItem);
}
#endif // wxUSE_OWNER_DRAWN
}