use item colour when drawing the focused item if we don't highlight it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1916,23 +1916,20 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPen *pen = wxTRANSPARENT_PEN;
|
wxPen *pen;
|
||||||
wxColour colText;
|
#ifndef __WXMAC__
|
||||||
|
// don't draw rect outline if we already have the background color
|
||||||
|
// under Max
|
||||||
if ( item->IsSelected() )
|
if ( item->IsSelected() )
|
||||||
{
|
|
||||||
pen = wxBLACK_PEN;
|
pen = wxBLACK_PEN;
|
||||||
|
else
|
||||||
if ( m_hasFocus )
|
#endif // !__WXMAC__
|
||||||
{
|
|
||||||
colText = wxSystemSettings::
|
|
||||||
GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __WXMAC__
|
|
||||||
// no rect outline, we already have the background color
|
|
||||||
pen = wxTRANSPARENT_PEN;
|
pen = wxTRANSPARENT_PEN;
|
||||||
#endif
|
|
||||||
|
wxColour colText;
|
||||||
|
if ( item->IsSelected() && m_hasFocus )
|
||||||
|
{
|
||||||
|
colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user