Correct text colour in wxIconTextRenderer

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 6409099be68f175659578d4ba27232eed5b4546b..7c60861449094b3bee06e94f50774a16ec19e19e 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1025,7 +1025,15 @@ bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const
 
 bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {
 
 bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state )
 {

-    dc->SetFont( GetOwner()->GetOwner()->GetFont() );
+    wxDataViewCtrl *view = GetOwner()->GetOwner();
+    
+    dc->SetFont( view->GetFont() );
+
+    wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ?
+                        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) :
+                        view->GetForegroundColour();
+
+    dc->SetTextForeground(col);

 
     const wxIcon &icon = m_value.GetIcon();
     if (icon.IsOk())
 
     const wxIcon &icon = m_value.GetIcon();
     if (icon.IsOk())