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

Remove unnecessary check whether x-coordinate >= 0

Browse Source 
Several lines before there is a block terminating the function if rect.x < 0 (measure item call) so there is no need to check after this block whether rect.x >= 0.
This commit is contained in:
Artur Wieczorek
2018-12-28 13:28:42 +01:00
parent b569a429a2
commit e13382f400
1 changed files with 117 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/editors.cpp
View File

@@ -824,8 +824,6 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
wxDC& dc = *pDc; wxDC& dc = *pDc;
dc.SetBrush(*wxWHITE_BRUSH); dc.SetBrush(*wxWHITE_BRUSH);
if ( rect.x >= 0 )
{
// //
// DrawItem call // DrawItem call
wxPGCellRenderer* renderer = NULL; wxPGCellRenderer* renderer = NULL;
@@ -952,16 +950,6 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
if ( renderer ) if ( renderer )
renderer->PostDrawCell(dc, this, *cell, renderFlags); renderer->PostDrawCell(dc, this, *cell, renderFlags);
} }
else
{
//
// MeasureItem call
p->OnCustomPaint( dc, rect, paintdata );
rect.height = paintdata.m_drawnHeight + 2;
rect.width = cis.x + wxCC_CUSTOM_IMAGE_MARGIN1 + wxCC_CUSTOM_IMAGE_MARGIN2 + 9;
}
}
static static
bool wxPGChoiceEditor_SetCustomPaintWidth( wxPropertyGrid* propGrid, wxPGComboBox* cb, int cmnVal ) bool wxPGChoiceEditor_SetCustomPaintWidth( wxPropertyGrid* propGrid, wxPGComboBox* cb, int cmnVal )