use renderer for drawing the item background on ports other than GTK2 and Mac too (why not?)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-20 08:58:52 +00:00
parent d8defde6b0
commit 419875a6f5

View File

@@ -2535,9 +2535,6 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
x=0; x=0;
GetVirtualSize(&w, &h); GetVirtualSize(&w, &h);
wxRect rect( x, item->GetY()+offset, w, total_h-offset); wxRect rect( x, item->GetY()+offset, w, total_h-offset);
#if !defined(__WXGTK20__) && !defined(__WXMAC__)
dc.DrawRectangle(rect);
#else
if (!item->IsSelected()) if (!item->IsSelected())
{ {
dc.DrawRectangle(rect); dc.DrawRectangle(rect);
@@ -2557,9 +2554,8 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
wxRendererNative::Get(). wxRendererNative::Get().
DrawItemSelectionRect(this, dc, rect, flags); DrawItemSelectionRect(this, dc, rect, flags);
} }
#endif
} }
else else // no full row highlight
{ {
if ( item->IsSelected() && if ( item->IsSelected() &&
(state != wxTREE_ITEMSTATE_NONE || image != NO_IMAGE) ) (state != wxTREE_ITEMSTATE_NONE || image != NO_IMAGE) )
@@ -2593,14 +2589,11 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
{ {
wxRect rect( item->GetX()-2, item->GetY()+offset, wxRect rect( item->GetX()-2, item->GetY()+offset,
item->GetWidth()+2, total_h-offset ); item->GetWidth()+2, total_h-offset );
#if !defined(__WXGTK20__) && !defined(__WXMAC__)
dc.DrawRectangle( rect );
#else
if ( hasBgColour ) if ( hasBgColour )
{ {
dc.DrawRectangle( rect ); dc.DrawRectangle( rect );
} }
else else // no specific background colour
{ {
rect.x -= 1; rect.x -= 1;
rect.width += 2; rect.width += 2;
@@ -2613,7 +2606,6 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
wxRendererNative::Get(). wxRendererNative::Get().
DrawItemSelectionRect(this, dc, rect, flags); DrawItemSelectionRect(this, dc, rect, flags);
} }
#endif
} }
} }