solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Rename variable to have a less confusing name

Browse source 
After the changes of the last commit this variable is not of wxImageList
type any more, so its name became confusing, so rename it and also be a
bit more precise by indicating that it corresponds to the small, and not
normal, images.

No real changes.
This commit is contained in:
Vadim Zeitlin 2022-10-25 23:09:31 +02:00
parent 502e189f47
commit 69648b4322
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/generic/listctrl.cpp
View file

@ -1134,19 +1134,19 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
// and the width of the icon, if any
int ix = 0, iy = 0; // init them just to suppress the compiler warnings
const int image = item.m_image;
wxWithImages *imageList;
wxWithImages *smallImages;
if ( image != -1 )
{
imageList = m_owner->GetSmallImages();
if ( imageList )
smallImages = m_owner->GetSmallImages();
if ( smallImages )
{
imageList->GetImageLogicalSize(this, image, ix, iy);
smallImages->GetImageLogicalSize(this, image, ix, iy);
wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
}
}
else
{
imageList = nullptr;
smallImages = nullptr;
}
// ignore alignment if there is not enough space anyhow
@ -1175,9 +1175,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h);
// if we have an image, draw it on the right of the label
if ( imageList )
if ( smallImages )
{
wxBitmap bmp = imageList->GetImageBitmapFor(this, image);
wxBitmap bmp = smallImages->GetImageBitmapFor(this, image);
dc.DrawBitmap(
bmp,
xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE,