Don't display cell image if wxPGProperty image exists
This commit is contained in:
parent
799f245149
commit
eec0fd271f
@ -230,6 +230,10 @@ bool wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
|
|||||||
|
|
||||||
property->GetDisplayInfo(column, selItem, flags, &text, &cell);
|
property->GetDisplayInfo(column, selItem, flags, &text, &cell);
|
||||||
|
|
||||||
|
// Property image takes precedence over cell image
|
||||||
|
if ( column == 1 && !isUnspecified && property->GetValueImage() )
|
||||||
|
cell.SetBitmap(wxNullBitmap);
|
||||||
|
|
||||||
imageWidth = PreDrawCell( dc, rect, cell, preDrawFlags );
|
imageWidth = PreDrawCell( dc, rect, cell, preDrawFlags );
|
||||||
|
|
||||||
if ( column == 1 )
|
if ( column == 1 )
|
||||||
|
Loading…
Reference in New Issue
Block a user