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

Alexandre Julliard julliard at winehq.org
Mon Mar 28 14:22:01 CDT 2011


Module: wine
Branch: master
Commit: 802ab38f0ce2f346e9b79e3c970495ebaeddbb05
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=802ab38f0ce2f346e9b79e3c970495ebaeddbb05

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sat Mar 26 16:49:21 2011 +0300

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

---

 dlls/comctl32/monthcal.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index b750a18..0e1a65c 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -668,7 +668,6 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM
   RECT r, r_temp;
   static BOOL bold_selected;
   BOOL selected_day = FALSE;
-  HBRUSH hbr;
   COLORREF oldCol = 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));
     oldCol = SetTextColor(hdc, infoPtr->colors[MCSC_MONTHBK]);
     oldBk = SetBkColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]);
-    hbr = GetSysColorBrush(COLOR_HIGHLIGHT);
-    FillRect(hdc, &r, hbr);
+    FillRect(hdc, &r, infoPtr->brushes[MCSC_TITLEBK]);
 
     selected_day = TRUE;
   }
@@ -1013,7 +1011,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const
   /* draw day abbreviations */
   SelectObject(hdc, infoPtr->hFont);
   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 */
   r = infoPtr->calendars[calIdx].wdays;
   r.right = r.left + infoPtr->width_increment;




More information about the wine-cvs mailing list