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

Show custom foreground colour when theme is used.

Browse Source
This commit is contained in:
Maarten Bent
2015-12-16 21:04:15 +01:00
parent bbe61adae8
commit 1585530623
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/renderer.cpp
View File

@@ -1036,10 +1036,20 @@ void wxRendererXP::DrawItemText(wxWindow* win,
textOpts.dwSize = sizeof(textOpts); textOpts.dwSize = sizeof(textOpts);
textOpts.dwFlags = DTT_STATEID; textOpts.dwFlags = DTT_STATEID;
textOpts.iStateId = itemState; textOpts.iStateId = itemState;
if (flags & wxCONTROL_DISABLED)
wxColour textColour = dc.GetTextForeground();
if (flags & wxCONTROL_SELECTED)
{ {
textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
}
else if (flags & wxCONTROL_DISABLED)
{
textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
}
if (textColour.IsOk()) {
textOpts.dwFlags |= DTT_TEXTCOLOR; textOpts.dwFlags |= DTT_TEXTCOLOR;
textOpts.crText = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT).GetPixel(); textOpts.crText = textColour.GetPixel();
} }
DWORD textFlags = DT_NOPREFIX; DWORD textFlags = DT_NOPREFIX;