comctl32/monthcal: Selection and abbreviations should use title colour.

This commit is contained in:
Nikolay Sivov 2011-03-26 16:49:21 +03:00 committed by Alexandre Julliard
parent 6d4b96020e
commit 802ab38f0c

View file

@ -668,7 +668,6 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM
RECT r, r_temp; RECT r, r_temp;
static BOOL bold_selected; static BOOL bold_selected;
BOOL selected_day = FALSE; BOOL selected_day = FALSE;
HBRUSH hbr;
COLORREF oldCol = 0; COLORREF oldCol = 0;
COLORREF oldBk = 0; COLORREF oldBk = 0;
@ -686,8 +685,7 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM
TRACE("%s\n", wine_dbgstr_rect(&r)); TRACE("%s\n", wine_dbgstr_rect(&r));
oldCol = SetTextColor(hdc, infoPtr->colors[MCSC_MONTHBK]); oldCol = SetTextColor(hdc, infoPtr->colors[MCSC_MONTHBK]);
oldBk = SetBkColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); oldBk = SetBkColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]);
hbr = GetSysColorBrush(COLOR_HIGHLIGHT); FillRect(hdc, &r, infoPtr->brushes[MCSC_TITLEBK]);
FillRect(hdc, &r, hbr);
selected_day = TRUE; selected_day = TRUE;
} }
@ -1013,7 +1011,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const
/* draw day abbreviations */ /* draw day abbreviations */
SelectObject(hdc, infoPtr->hFont); SelectObject(hdc, infoPtr->hFont);
SetBkColor(hdc, infoPtr->colors[MCSC_MONTHBK]); SetBkColor(hdc, infoPtr->colors[MCSC_MONTHBK]);
SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); SetTextColor(hdc, infoPtr->colors[MCSC_TITLEBK]);
/* rectangle to draw a single day abbreviation within */ /* rectangle to draw a single day abbreviation within */
r = infoPtr->calendars[calIdx].wdays; r = infoPtr->calendars[calIdx].wdays;
r.right = r.left + infoPtr->width_increment; r.right = r.left + infoPtr->width_increment;