X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f66f6a5b3583b02c34854556eb83e3a808524ce..be10c7f969bb460dc79bd8946d59bf54c98ac660:/src/msw/listctrl.cpp diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 97388cd847..0772db7a25 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -951,7 +951,7 @@ bool wxListCtrl::SetItemColumnImage(long item, long column, int image) wxListItem info; info.m_mask = wxLIST_MASK_IMAGE; - info.m_image = image; + info.m_image = image == -1 ? I_IMAGENONE : image; info.m_itemId = item; info.m_col = column; @@ -1751,11 +1751,9 @@ long wxListCtrl::InsertItem(long index, int imageIndex) long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex) { wxListItem info; - info.m_image = imageIndex; + info.m_image = imageIndex == -1 ? I_IMAGENONE : imageIndex; info.m_text = label; - info.m_mask = wxLIST_MASK_TEXT; - if (imageIndex > -1) - info.m_mask |= wxLIST_MASK_IMAGE; + info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE; info.m_itemId = index; return InsertItem(info); }