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

Fix invalid listctrl imagelist assert in wxQT

Browse Source 
This reverts the bug introduced in r77935, now the list control sample works again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mariano Reingart
2014-10-09 04:44:54 +00:00
parent 5a6ec20ebc
commit 9622023abc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/listctrl.cpp
View File

@@ -316,7 +316,7 @@ bool wxListCtrl::SetItem(wxListItem& info)
{ {
if (info.m_image >= 0) if (info.m_image >= 0)
{ {
wxImageList *imglst = GetImageList(wxIMAGE_LIST_NORMAL); wxImageList *imglst = GetImageList(InReportView() ? wxIMAGE_LIST_SMALL : wxIMAGE_LIST_NORMAL);
wxCHECK_MSG(imglst, false, "invalid listctrl imagelist"); wxCHECK_MSG(imglst, false, "invalid listctrl imagelist");
const wxBitmap* bitmap = imglst->GetBitmapPtr(info.m_image); const wxBitmap* bitmap = imglst->GetBitmapPtr(info.m_image);
if (bitmap != NULL) if (bitmap != NULL)