AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use standard colour for the selected tree item text as well as background

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-09-04 14:30:25 +00:00
parent 8705ab68e2
commit 2076893b53
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/treectrl.cpp
View File

@ -2392,17 +2392,16 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
}
HFONT hFont;
wxColour colText, colBack;
if ( attr->HasFont() )
{
wxFont font = attr->GetFont();
hFont = (HFONT)font.GetResourceHandle();
hFont = GetHfontOf(attr->GetFont());
}
else
{
hFont = 0;
}
wxColour colText;
if ( attr->HasTextColour() )
{
colText = attr->GetTextColour();
@ -2415,16 +2414,14 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// selection colours should override ours
if ( nmcd.uItemState & CDIS_SELECTED )
{
DWORD clrBk = ::GetSysColor(COLOR_HIGHLIGHT);
lptvcd->clrTextBk = clrBk;
// try to make the text visible
lptvcd->clrText = wxColourToRGB(colText);
lptvcd->clrText |= ~clrBk;
lptvcd->clrText &= 0x00ffffff;
lptvcd->clrTextBk =
::GetSysColor(COLOR_HIGHLIGHT);
lptvcd->clrText =
::GetSysColor(COLOR_HIGHLIGHTTEXT);
}
else
else // !selected
{
wxColour colBack;
if ( attr->HasBackgroundColour() )
{
colBack = attr->GetBackgroundColour();