Render cell background in renderer only if rendering on propgrid canvas

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index ae1d0c79b2a04b6a4ac90aead76b5b346673b5ee..87ea4c0d882769f996f56d3b6f065df7dafc28dd 100644 (file)
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -691,6 +691,8 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
 
         if ( flags & wxODCB_PAINTING_CONTROL )
             renderFlags |= wxPGCellRenderer::Control;
+        else
+            renderFlags |= wxPGCellRenderer::ChoicePopup;
 
         if ( flags & wxODCB_PAINTING_SELECTED )
             renderFlags |= wxPGCellRenderer::Selected;

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 10ba288e6554b55a4e600673b7d572053f2c214f..53a26de39ffa726c53f994b3517d90bda3b28d03 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -149,8 +149,10 @@ int wxPGCellRenderer::PreDrawCell( wxDC& dc, const wxRect& rect, const wxPGCell&
         dc.SetTextForeground(cell.GetFgCol());
     }
 
-    // Draw Background
-    dc.DrawRectangle(rect);
+    // Draw Background, but only if not rendering in control
+    // (as control already has rendered correct background).
+    if ( !(flags & (Control|ChoicePopup)) )
+        dc.DrawRectangle(rect);
 
     const wxBitmap& bmp = cell.GetBitmap();
     if ( bmp.Ok() &&