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

Use mask when drawing bitmaps in generic wxDataViewCtrl.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-09-17 15:25:52 +00:00
parent 3e33568e0b
commit 0d60699143
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -577,6 +577,7 @@ All (GUI):
- wxRTC: extracted XML utilities into a separate class for potential reuse. - wxRTC: extracted XML utilities into a separate class for potential reuse.
- wxPropertyGrid: improve composite flags handling (Jens Lody). - wxPropertyGrid: improve composite flags handling (Jens Lody).
- Don't crash laying out wxGridBagSizer with only hidden elements (briceandre). - Don't crash laying out wxGridBagSizer with only hidden elements (briceandre).
- Fix alignment and transparency of bitmaps in wxDataViewCtrl (Eric Jensen).
wxGTK: wxGTK:

2
src/generic/datavgen.cpp
View File

@@ -1021,7 +1021,7 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
{ {
if (m_bitmap.IsOk()) 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()) else if (m_icon.IsOk())
dc->DrawIcon( m_icon, cell.x, cell.y ); dc->DrawIcon( m_icon, cell.x, cell.y );