added wxColour(RGBColor) ctor and use it insteaf of constructing wxColour from RGBColor manually in several places (replaces patch 1662064)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-10 15:48:56 +00:00
parent ee864b6db4
commit 055de35012
9 changed files with 34 additions and 17 deletions

View File

@@ -370,16 +370,16 @@ wxRendererMac::DrawItemSelectionRect(wxWindow *win,
const wxRect& rect,
int flags )
{
RGBColor selColor;
if (flags & wxCONTROL_SELECTED)
{
if (flags & wxCONTROL_FOCUSED)
GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &selColor);
else
GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &selColor);
}
if ( !(flags & wxCONTROL_SELECTED) )
return;
wxBrush selBrush = wxBrush( wxColour( selColor.red, selColor.green, selColor.blue ), wxSOLID );
RGBColor selColor;
GetThemeBrushAsColor(flags & wxCONTROL_FOCUSED
? kThemeBrushAlternatePrimaryHighlightColor
: kThemeBrushSecondaryHighlightColor,
32, true, &selColor);
wxBrush selBrush(selColor);
dc.SetPen( *wxTRANSPARENT_PEN );
dc.SetBrush( selBrush );