From 4b69c1a71899df6d8eb73a1d0899f38a1f3918e2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 3 Feb 2018 15:35:20 +0100 Subject: [PATCH] Remove m_penExpander from generic wxDataViewCtrl code This pen was never used as wxRendererNative::DrawTreeItemButton() always uses its own colours, even in the generic version. --- src/generic/datavgen.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 2dff6c1e3d..95a056e350 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -932,9 +932,6 @@ private: // the pen used to draw horiz/vertical rules wxPen m_penRule; - // the pen used to draw the expander and the lines - wxPen m_penExpander; - // This is the tree structure of the model wxDataViewTreeNode * m_root; int m_count; @@ -1959,10 +1956,6 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_penRule = wxPen(GetRuleColour()); - // compose a pen whichcan draw black lines - // TODO: maybe there is something system colour to use - m_penExpander = wxPen(wxColour(0,0,0)); - m_root = wxDataViewTreeNode::CreateRootNode(); // Make m_count = -1 will cause the class recaculate the real displaying number of rows. @@ -2541,9 +2534,6 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // draw expander if needed if ( node->HasChildren() ) { - dc.SetPen( m_penExpander ); - dc.SetBrush( wxNullBrush ); - wxRect rect = cell_rect; rect.x += indent; rect.width = expWidth;