Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for my fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-23 20:13:13 +00:00
parent 2cef71bc23
commit 6c051af454
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/treectlg.cpp
View File

@@ -2255,7 +2255,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
} }
int total_h = GetLineHeight(item); int total_h = GetLineHeight(item);
bool hasCustomBackground = false; bool drawItemBackground = false;
if ( item->IsSelected() ) if ( item->IsSelected() )
{ {
@@ -2273,13 +2273,14 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
#else #else
dc.SetBrush(*(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush)); dc.SetBrush(*(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush));
#endif #endif
drawItemBackground = true;
} }
else else
{ {
wxColour colBg; wxColour colBg;
if ( attr && attr->HasBackgroundColour() ) if ( attr && attr->HasBackgroundColour() )
{ {
hasCustomBackground = true; drawItemBackground = true;
colBg = attr->GetBackgroundColour(); colBg = attr->GetBackgroundColour();
} }
else else
@@ -2310,7 +2311,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
// On GTK+ 2, drawing a 'normal' background is wrong for themes that // On GTK+ 2, drawing a 'normal' background is wrong for themes that
// don't allow backgrounds to be customized. Not drawing the background, // don't allow backgrounds to be customized. Not drawing the background,
// except for custom item backgrounds, works for both kinds of theme. // except for custom item backgrounds, works for both kinds of theme.
else if (hasCustomBackground) else if (drawItemBackground)
{ {
dc.DrawRectangle( item->GetX()-2, item->GetY()+offset, dc.DrawRectangle( item->GetX()-2, item->GetY()+offset,
item->GetWidth()+2, total_h-offset ); item->GetWidth()+2, total_h-offset );