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

Implement attributes support in generic wxDataViewIconTextRenderer.

Browse Source 
Simply override RenderWithAttr() instead of Render().

Update the sample to show that this works now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-12 22:44:15 +00:00
parent 3e60a3c147
commit 38c349189a
3 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/generic/datavgen.cpp
View File

@@ -1108,10 +1108,6 @@ const wxString &varianttype, wxDataViewCellMode mode, int align ) :
SetAlignment(align);
}
wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer()
{
}
bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value )
{
m_value << value;
@@ -1123,17 +1119,23 @@ bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const
return false;
}
bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
bool
wxDataViewIconTextRenderer::RenderWithAttr(wxDC& dc,
const wxRect& rect,
int align,
const wxDataViewItemAttr *attr,
int state)
{
int xoffset = 0;
const wxIcon &icon = m_value.GetIcon();
if (icon.IsOk())
const wxIcon& icon = m_value.GetIcon();
if ( icon.IsOk() )
{
dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2));
xoffset = icon.GetWidth()+4;
dc.DrawIcon(icon, rect.x, rect.y + (rect.height - icon.GetHeight())/2);
xoffset = icon.GetWidth()+4;
}
RenderText( m_value.GetText(), xoffset, cell, dc, state );
RenderText(dc, rect, align, m_value.GetText(), attr, state, xoffset);
return true;
}