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

If -1 is passed to InsertItem for the imageIndex then don't set wxLIST_MASK_IMAGE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-08-02 20:23:42 +00:00
parent 6c797d8fd1
commit ec3f5752a0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/listctrl.cpp
View File

@@ -4027,7 +4027,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
wxListLineData *line = new wxListLineData(this); wxListLineData *line = new wxListLineData(this);
line->SetItem( item.m_col, item ); line->SetItem( item.m_col, item );
if ( item.m_mask & wxLIST_MASK_IMAGE ) if ( item.m_mask & wxLIST_MASK_IMAGE && item.GetImage() != -1)
{ {
// Reset the buffered height if it's not big enough for the new image. // Reset the buffered height if it's not big enough for the new image.
if (m_small_image_list) if (m_small_image_list)
@@ -4866,7 +4866,9 @@ long wxGenericListCtrl::InsertItem( long index, const wxString &label, int image
wxListItem info; wxListItem info;
info.m_text = label; info.m_text = label;
info.m_image = imageIndex; info.m_image = imageIndex;
info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE; info.m_mask = wxLIST_MASK_TEXT;
if (imageIndex > -1)
info.m_mask |= wxLIST_MASK_IMAGE;
info.m_itemId = index; info.m_itemId = index;
return InsertItem( info ); return InsertItem( info );
} }

4
src/msw/listctrl.cpp
View File

@@ -1727,7 +1727,9 @@ long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
wxListItem info; wxListItem info;
info.m_image = imageIndex; info.m_image = imageIndex;
info.m_text = label; info.m_text = label;
info.m_mask = wxLIST_MASK_IMAGE | wxLIST_MASK_TEXT; info.m_mask = wxLIST_MASK_TEXT;
if (imageIndex > -1)
info.m_mask |= wxLIST_MASK_IMAGE;
info.m_itemId = index; info.m_itemId = index;
return InsertItem(info); return InsertItem(info);
} }