From 419875a6f5efa6c16b75d4a5e104ae6d88ed08fc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 20 Oct 2008 08:58:52 +0000 Subject: [PATCH] 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 --- src/generic/treectlg.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 4c0d7d69fe..0e14dc2830 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -2535,9 +2535,6 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) x=0; GetVirtualSize(&w, &h); wxRect rect( x, item->GetY()+offset, w, total_h-offset); -#if !defined(__WXGTK20__) && !defined(__WXMAC__) - dc.DrawRectangle(rect); -#else if (!item->IsSelected()) { dc.DrawRectangle(rect); @@ -2557,9 +2554,8 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) wxRendererNative::Get(). DrawItemSelectionRect(this, dc, rect, flags); } -#endif } - else + else // no full row highlight { if ( item->IsSelected() && (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, item->GetWidth()+2, total_h-offset ); -#if !defined(__WXGTK20__) && !defined(__WXMAC__) - dc.DrawRectangle( rect ); -#else if ( hasBgColour ) { dc.DrawRectangle( rect ); } - else + else // no specific background colour { rect.x -= 1; rect.width += 2; @@ -2613,7 +2606,6 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) wxRendererNative::Get(). DrawItemSelectionRect(this, dc, rect, flags); } -#endif } } -- 2.45.2