From eec0fd271f33591f1d70d6fd3a837bbf6c3cb90d Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 13 Apr 2020 19:00:45 +0200
Subject: [PATCH] Don't display cell image if wxPGProperty image exists

---
 src/propgrid/property.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index ea207b6719..4237a1fc95 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -230,6 +230,10 @@ bool wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
 
     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 );
 
     if ( column == 1 )