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

Don't use wxToolBarToolBase::SetNormalBitmap() in wxToolbook.

Browse Source 
This doesn't work, use wxToolBar::SetToolNormalBitmap() which does.

As a side effect, don't silently ignore invalid page indices in
wxToolbook::SetPageImage() any more, they should result in an assert, which is
now going to happen inside wxToolBar::SetToolNormalBitmap() if this method is
called with an invalid index.

See #16985.
This commit is contained in:
Vadim Zeitlin
2015-05-12 17:08:11 +02:00
parent 17fa642bfd
commit e211757af4
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/generic/toolbkg.cpp
View File

@@ -167,16 +167,9 @@ bool wxToolbook::SetPageImage(size_t n, int imageId)
if (!GetImageList()) if (!GetImageList())
return false; return false;
wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1); GetToolBar()->SetToolNormalBitmap(n + 1, GetImageList()->GetBitmap(imageId));
if (tool)
{ return true;
// Find the image list index for this tool
wxBitmap bitmap = GetImageList()->GetBitmap(imageId);
tool->SetNormalBitmap(bitmap);
return true;
}
else
return false;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------