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

Fix for #12979: wrong unfocused selected text colour in wxTreeCtrl/wxListCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@67011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-02-24 10:02:44 +00:00
parent a2abbb1cc9
commit fbf2343ea0
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/generic/listctrl.cpp
View File

@@ -1426,8 +1426,17 @@ bool wxListLineData::SetAttributes(wxDC *dc,
else else
colText = *wxBLACK; colText = *wxBLACK;
} }
#else
{
#ifdef __WXGTK__
if (m_owner->HasFocus())
colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
else
colText = wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT);
#else #else
colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
#endif
}
#endif #endif
else if ( attr && attr->HasTextColour() ) else if ( attr && attr->HasTextColour() )
colText = attr->GetTextColour(); colText = attr->GetTextColour();

9
src/generic/treectlg.cpp
View File

@@ -2549,7 +2549,16 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
#ifdef __WXMAC__ #ifdef __WXMAC__
colText = *wxWHITE; colText = *wxWHITE;
#else #else
#ifdef __WXGTK__
if (m_hasFocus)
colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
else
colText = wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT);
#else
colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
#endif
#endif #endif
} }
else else