From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 17 Sep 2013 15:25:52 +0000 (+0000)
Subject: Use mask when drawing bitmaps in generic wxDataViewCtrl.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0d606991439a152cf0de0a18904be55685d81649

Use mask when drawing bitmaps in generic wxDataViewCtrl.

This allows to have bitmaps with transparent areas in them.

Closes #15510.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 865271b1e8..1391d17ec7 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -577,6 +577,7 @@ All (GUI):
 - wxRTC: extracted XML utilities into a separate class for potential reuse.
 - wxPropertyGrid: improve composite flags handling (Jens Lody).
 - Don't crash laying out wxGridBagSizer with only hidden elements (briceandre).
+- Fix alignment and transparency of bitmaps in wxDataViewCtrl (Eric Jensen).
 
 wxGTK:
 
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index d90cd83ef0..d5c0614e60 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1021,7 +1021,7 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
 bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
 {
     if (m_bitmap.IsOk())
-        dc->DrawBitmap( m_bitmap, cell.x, cell.y );
+        dc->DrawBitmap( m_bitmap, cell.x, cell.y, true /* use mask */ );
     else if (m_icon.IsOk())
         dc->DrawIcon( m_icon, cell.x, cell.y );