Changeset 6709 for trunk/src/comctl32/monthcal.c

Timestamp:

Sep 15, 2001, 11:26:26 AM (24 years ago)

Author:

sandervl

Message:

restored old version

File:

• trunk/src/comctl32/monthcal.c (modified) (94 diffs)

trunk/src/comctl32/monthcal.c

@@ -1 +1 @@
 /* Month calendar control
- *
+
  *
  * Copyright 1998, 1999 Eric Kohl (ekohl@abo.rhein-zeitung.de)
  * Copyright 1999 Alex Priem (alexp@sci.kun.nl)
  * Copyright 1999 Chris Morgan <cmorgan@wpi.edu> and
- *        James Abbatiello <abbeyj@wpi.edu>
+ *                James Abbatiello <abbeyj@wpi.edu>
  * Copyright 2000 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
  *
@@ -13 +13 @@
  *
  *  FIXME: handle resources better (doesn't work now); also take care
- *         of internationalization.
+           of internationalization. 
  *  FIXME: keyboard handling.
  */
@@ -43 +43 @@
 DEFAULT_DEBUG_CHANNEL(monthcal);
 
-#define MC_SEL_LBUTUP       1   /* Left button released */
-#define MC_SEL_LBUTDOWN     2   /* Left button pressed in calendar */
+#define MC_SEL_LBUTUP       1   /* Left button released */
+#define MC_SEL_LBUTDOWN     2   /* Left button pressed in calendar */
 #define MC_PREVPRESSED      4   /* Prev month button pressed */
 #define MC_NEXTPRESSED      8   /* Next month button pressed */
-#define MC_NEXTMONTHDELAY   350 /* when continuously pressing `next */
-                                        /* month', wait 500 ms before going */
-                                        /* to the next month */
-#define MC_NEXTMONTHTIMER   1           /* Timer ID's */
-#define MC_PREVMONTHTIMER   2
+#define MC_NEXTMONTHDELAY   350 /* when continuously pressing `next */
+                                                                                /* month', wait 500 ms before going */
+                                                                                /* to the next month */
+#define MC_NEXTMONTHTIMER   1                   /* Timer ID's */
+#define MC_PREVMONTHTIMER   2                   
 
 typedef struct
@@ -58 +58 @@
     COMCTL32_HEADER header;
 #endif
-    COLORREF    bk;
-    COLORREF    txt;
-    COLORREF    titlebk;
-    COLORREF    titletxt;
-    COLORREF    monthbk;
-    COLORREF    trailingtxt;
-    HFONT   hFont;
-    HFONT   hBoldFont;
-    int     textHeight;
-    int     textWidth;
-    int     height_increment;
-    int     width_increment;
-    int     left_offset;
-    int     top_offset;
-    int     firstDayplace; /* place of the first day of the current month */
-    int     delta;  /* scroll rate; # of months that the */
+    COLORREF    bk;
+    COLORREF    txt;
+    COLORREF    titlebk;
+    COLORREF    titletxt;
+    COLORREF    monthbk;
+    COLORREF    trailingtxt;
+    HFONT       hFont;
+    HFONT       hBoldFont;
+    int         textHeight;
+    int         textWidth;
+    int         height_increment;
+    int         width_increment;
+    int         left_offset;
+    int         top_offset;
+    int         firstDayplace; /* place of the first day of the current month */
+    int         delta;  /* scroll rate; # of months that the */
                         /* control moves when user clicks a scroll button */
-    int     visible;    /* # of months visible */
-    int     firstDay;   /* Start month calendar with firstDay's day */
-    int     monthRange;
+    int         visible;        /* # of months visible */
+    int         firstDay;       /* Start month calendar with firstDay's day */
+    int         monthRange;
     MONTHDAYSTATE *monthdayState;
-    SYSTEMTIME  todaysDate;
-    DWORD   currentMonth;
-    DWORD   currentYear;
-    int     status;     /* See MC_SEL flags */
-    int     curSelDay;  /* current selected day */
-    int     firstSelDay;    /* first selected day */
-    int     maxSelCount;
-    SYSTEMTIME  minSel;
-    SYSTEMTIME  maxSel;
-    DWORD   rangeValid;
-    SYSTEMTIME  minDate;
-    SYSTEMTIME  maxDate;
-
-    RECT rcClient;  /* rect for whole client area */
-    RECT rcDraw;    /* rect for drawable portion of client area */
-    RECT title;     /* rect for the header above the calendar */
-    RECT titlebtnnext;  /* the `next month' button in the header */
-    RECT titlebtnprev;  /* the `prev month' button in the header */
-    RECT titlemonth;    /* the `month name' txt in the header */
-    RECT titleyear; /* the `year number' txt in the header */
-    RECT wdays;     /* week days at top */
-    RECT days;      /* calendar area */
-    RECT weeknums;  /* week numbers at left side */
-    RECT todayrect; /* `today: xx/xx/xx' text rect */
+    SYSTEMTIME  todaysDate;
+    DWORD       currentMonth;
+    DWORD       currentYear;
+    int         status;         /* See MC_SEL flags */
+    int         curSelDay;      /* current selected day */
+    int         firstSelDay;    /* first selected day */
+    int         maxSelCount;
+    SYSTEMTIME  minSel;
+    SYSTEMTIME  maxSel;
+    DWORD       rangeValid;
+    SYSTEMTIME  minDate;
+    SYSTEMTIME  maxDate;
+                
+    RECT rcClient;      /* rect for whole client area */
+    RECT rcDraw;        /* rect for drawable portion of client area */
+    RECT title;         /* rect for the header above the calendar */
+    RECT titlebtnnext;  /* the `next month' button in the header */
+    RECT titlebtnprev;  /* the `prev month' button in the header */     
+    RECT titlemonth;    /* the `month name' txt in the header */
+    RECT titleyear;     /* the `year number' txt in the header */
+    RECT wdays;         /* week days at top */
+    RECT days;          /* calendar area */
+    RECT weeknums;      /* week numbers at left side */
+    RECT todayrect;     /* `today: xx/xx/xx' text rect */
     HWND hWndYearEdit;  /* Window Handle of edit box to handle years */
     HWND hWndYearUpDown;/* Window Handle of updown box to handle years */
@@ -141 +141 @@
 
 /* make sure that time is valid */
-static int MONTHCAL_ValidateTime(SYSTEMTIME time)
+static int MONTHCAL_ValidateTime(SYSTEMTIME time) 
 {
   if(time.wMonth > 12) return FALSE;
   if(time.wDayOfWeek > 6) return FALSE;
   if(time.wDay > MONTHCAL_MonthLength(time.wMonth, time.wYear))
-      return FALSE;
+          return FALSE;
   if(time.wHour > 23) return FALSE;
   if(time.wMinute > 59) return FALSE;
@@ -156 +156 @@
 
 
-void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to)
+void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) 
 {
   to->wYear = from->wYear;
@@ -169 +169 @@
 
 
-/* Note:Depending on DST, this may be offset by a day.
+/* Note:Depending on DST, this may be offset by a day. 
    Need to find out if we're on a DST place & adjust the clock accordingly.
    Above function assumes we have a valid data.
@@ -182 +182 @@
   year-=(month < 3);
 
-  return((year + year/4 - year/100 + year/400 +
+  return((year + year/4 - year/100 + year/400 + 
          DayOfWeekTable[month-1] + day - 1 ) % 7);
 }
@@ -189 +189 @@
    and day in the calendar. day== 0 mean the last day of tha last month
 */
-static int MONTHCAL_CalcDayFromPos(MONTHCAL_INFO *infoPtr, int x, int y,
-                   int *daypos,int *weekpos)
+static int MONTHCAL_CalcDayFromPos(MONTHCAL_INFO *infoPtr, int x, int y, 
+                                   int *daypos,int *weekpos) 
 {
   int retval, firstDay;
@@ -202 +202 @@
   *daypos = (x - infoPtr->days.left ) / infoPtr->width_increment;
   *weekpos = (y - infoPtr->days.top ) / infoPtr->height_increment;
-
+    
   firstDay = (MONTHCAL_CalculateDayOfWeek(1, infoPtr->currentMonth, infoPtr->currentYear)+6 - infoPtr->firstDay)%7;
   retval = *daypos + (7 * *weekpos) - firstDay;
@@ -211 +211 @@
 /* sets x and y to be the position of the day */
 /* x == day, y == week where(0,0) == firstDay, 1st week */
-static void MONTHCAL_CalcDayXY(MONTHCAL_INFO *infoPtr, int day, int month,
+static void MONTHCAL_CalcDayXY(MONTHCAL_INFO *infoPtr, int day, int month, 
                                  int *x, int *y)
 {
@@ -227 +227 @@
     if(prevMonth==0)
        prevMonth = 12;
-
+   
     *x = (MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear) - firstDay) % 7;
     *y = 0;
@@ -240 +240 @@
 
 /* x: column(day), y: row(week) */
-static void MONTHCAL_CalcDayRect(MONTHCAL_INFO *infoPtr, RECT *r, int x, int y)
+static void MONTHCAL_CalcDayRect(MONTHCAL_INFO *infoPtr, RECT *r, int x, int y) 
 {
   r->left = infoPtr->days.left + x * infoPtr->width_increment;
@@ -252 +252 @@
 /* day is the day value of the month(1 == 1st), month is the month */
 /* value(january == 1, december == 12) */
-static inline void MONTHCAL_CalcPosFromDay(MONTHCAL_INFO *infoPtr,
+static inline void MONTHCAL_CalcPosFromDay(MONTHCAL_INFO *infoPtr, 
                                             int day, int month, RECT *r)
 {
@@ -278 +278 @@
   x = day_rect.left;
   y = day_rect.top;
-
+        
   points[0].x = x;
   points[0].y = y - 1;
@@ -287 +287 @@
   points[3].x = x + infoPtr->width_increment;
   points[3].y = y + 0.5 * infoPtr->height_increment;
-
+        
   points[4].x = x + infoPtr->width_increment;
   points[4].y = y + 0.9 * infoPtr->height_increment;
@@ -294 +294 @@
   points[6].x = x + 0.5 * infoPtr->width_increment;
   points[6].y = y + 0.9 * infoPtr->height_increment; /* bring the bottom up just
-                a hair to fit inside the day rectangle */
-
+                                a hair to fit inside the day rectangle */
+        
   points[7].x = x + 0.2 * infoPtr->width_increment;
   points[7].y = y + 0.8 * infoPtr->height_increment;
@@ -309 +309 @@
   points[12].x = x + 0.4 * infoPtr->width_increment;
   points[12].y = y + 0.2 * infoPtr->height_increment;
-
+  
   PolyBezier(hdc, points, 13);
   DeleteObject(hRedPen);
@@ -329 +329 @@
   sprintf(buf, "%d", day);
 
-/* No need to check styles: when selection is not valid, it is set to zero.
+/* No need to check styles: when selection is not valid, it is set to zero. 
  * 1<day<31, so evertyhing's OK.
  */
@@ -349 +349 @@
 
     /* FIXME: this may need to be changed now b/c of the other
-    drawing changes 11/3/99 CMM */
+        drawing changes 11/3/99 CMM */
     r2.left   = r.left - 0.25 * infoPtr->textWidth;
     r2.top    = r.top;
@@ -390 +390 @@
 
 /* CHECKME: For `todays date', do we need to check the locale?*/
-static void MONTHCAL_Refresh(HWND hwnd, HDC hdc, PAINTSTRUCT* ps)
+static void MONTHCAL_Refresh(HWND hwnd, HDC hdc, PAINTSTRUCT* ps) 
 {
   MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
@@ -425 +425 @@
   hbr = CreateSolidBrush (infoPtr->bk);
   FillRect(hdc, rcClient, hbr);
-  DeleteObject(hbr);
+  DeleteObject(hbr);       
 
   /* draw header */
@@ -434 +434 @@
     DeleteObject(hbr);
   }
-
+        
   /* if the previous button is pressed draw it depressed */
   if(IntersectRect(&rcTemp, &(ps->rcPaint), prev))
-  {
+  {  
     if((infoPtr->status & MC_PREVPRESSED))
         DrawFrameControl(hdc, prev, DFC_SCROLL,
-       DFCS_SCROLLLEFT | DFCS_PUSHED |
+           DFCS_SCROLLLEFT | DFCS_PUSHED |
           (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0));
     else /* if the previous button is pressed draw it depressed */
       DrawFrameControl(hdc, prev, DFC_SCROLL,
-       DFCS_SCROLLLEFT |(dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0));
-  }
-
-  /* if next button is depressed draw it depressed */
+           DFCS_SCROLLLEFT |(dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0));
+  }
+
+  /* if next button is depressed draw it depressed */   
   if(IntersectRect(&rcTemp, &(ps->rcPaint), next))
   {
     if((infoPtr->status & MC_NEXTPRESSED))
       DrawFrameControl(hdc, next, DFC_SCROLL,
-           DFCS_SCROLLRIGHT | DFCS_PUSHED |
+           DFCS_SCROLLRIGHT | DFCS_PUSHED |
            (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0));
     else /* if the next button is pressed draw it depressed */
@@ -466 +466 @@
   titlemonth->left   = title->left;
   titlemonth->right  = title->right;
-
+ 
   GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SMONTHNAME1+infoPtr->currentMonth -1,
-          buf1,sizeof(buf1));
+                  buf1,sizeof(buf1));
   sprintf(buf, "%s %ld", buf1, infoPtr->currentYear);
-
+ 
   if(IntersectRect(&rcTemp, &(ps->rcPaint), titlemonth))
   {
-    DrawTextA(hdc, buf, strlen(buf), titlemonth,
+    DrawTextA(hdc, buf, strlen(buf), titlemonth, 
                         DT_CENTER | DT_VCENTER | DT_SINGLELINE);
   }
@@ -481 +481 @@
 /* titlemonth left/right contained rect for whole titletxt('June  1999')
   * MCM_HitTestInfo wants month & year rects, so prepare these now.
-  *(no, we can't draw them separately; the whole text is centered)
+  *(no, we can't draw them separately; the whole text is centered) 
   */
   GetTextExtentPoint32A(hdc, buf, strlen(buf), &size);
@@ -489 +489 @@
   titlemonth->right = titlemonth->left + size.cx;
   titleyear->left = titlemonth->right;
-
+ 
   /* draw month area */
   rcTemp.top=infoPtr->wdays.top;
@@ -501 +501 @@
     DeleteObject(hbr);
   }
-
+        
 /* draw line under day abbreviatons */
 
   MoveToEx(hdc, infoPtr->days.left + 3, title->bottom + textHeight + 1, NULL);
-
+     
   LineTo(hdc, rcDraw->right - 3, title->bottom + textHeight + 1);
-
+  
   prevMonth = infoPtr->currentMonth - 1;
   if(prevMonth == 0) /* if currentMonth is january(1) prevMonth is */
@@ -529 +529 @@
   for(j=0; j<7; j++) {
     GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SABBREVDAYNAME1 + (i +j)%7,
-            buf,sizeof(buf));
+                    buf,sizeof(buf));
     DrawTextA(hdc, buf, strlen(buf), days,
                          DT_CENTER | DT_VCENTER | DT_SINGLELINE );
@@ -537 +537 @@
 
 /* draw day numbers; first, the previous month */
-
+  
   firstDay = MONTHCAL_CalculateDayOfWeek(1, infoPtr->currentMonth, infoPtr->currentYear);
-
-  day = MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear)  +
+  
+  day = MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear)  + 
     (infoPtr->firstDay + 7  - firstDay)%7 + 1;
   if (day > MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear))
@@ -553 +553 @@
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
     {
-      MONTHCAL_DrawDay(hdc, infoPtr, day, prevMonth, i, 0,
+      MONTHCAL_DrawDay(hdc, infoPtr, day, prevMonth, i, 0, 
           infoPtr->monthdayState[m] & mask);
     }
@@ -577 +577 @@
     {
 
-      MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth, i, 0,
-    infoPtr->monthdayState[m] & mask);
+      MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth, i, 0, 
+        infoPtr->monthdayState[m] & mask);
 
       if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) &&
           (day==infoPtr->todaysDate.wDay) &&
-      (infoPtr->currentYear == infoPtr->todaysDate.wYear)) {
+          (infoPtr->currentYear == infoPtr->todaysDate.wYear)) {
         if(!(dwStyle & MCS_NOTODAYCIRCLE))
-      MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
+          MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
       }
     }
@@ -595 +595 @@
   j = 1; /* move to the 2nd week of the current month */
   i = 0; /* move back to sunday */
-  while(day <= MONTHCAL_MonthLength(infoPtr->currentMonth, infoPtr->currentYear)) {
+  while(day <= MONTHCAL_MonthLength(infoPtr->currentMonth, infoPtr->currentYear)) {     
     MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, j);
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
@@ -604 +604 @@
       if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) &&
           (day==infoPtr->todaysDate.wDay) &&
-          (infoPtr->currentYear == infoPtr->todaysDate.wYear))
-        if(!(dwStyle & MCS_NOTODAYCIRCLE))
-      MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
+          (infoPtr->currentYear == infoPtr->todaysDate.wYear)) 
+        if(!(dwStyle & MCS_NOTODAYCIRCLE))  
+          MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
     }
     mask<<=1;
@@ -627 +627 @@
     MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, j);
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
-    {
+    {   
       MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth + 1, i, j,
-        infoPtr->monthdayState[m] & mask);
+                infoPtr->monthdayState[m] & mask);
     }
 
     mask<<=1;
     day++;
-    i++;
+    i++;        
     if(i==7) { /* past saturday, go to next week's sunday */
       i = 0;
@@ -650 +650 @@
     if(!(dwStyle & MCS_NOTODAYCIRCLE))  {
       /*day is the number of days from nextmonth we put on the calendar */
-      MONTHCAL_CircleDay(hdc, infoPtr,
-             day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear),
-             infoPtr->currentMonth);
+      MONTHCAL_CircleDay(hdc, infoPtr, 
+                         day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear), 
+                         infoPtr->currentMonth);
       offset+=textWidth;
     }
     if (!LoadStringA(COMCTL32_hModule,IDM_TODAY,buf1,sizeof(buf1)))
       {
-    WARN("Can't load resource\n");
-    strcpy(buf1,"Today:");
+        WARN("Can't load resource\n");
+        strcpy(buf1,"Today:");
       }
     MONTHCAL_CalcDayRect(infoPtr, &rtoday, 1, 6);
@@ -674 +674 @@
   }
 
-/*eventually draw week numbers*/
+/*eventually draw week numbers*/   
   if(dwStyle & MCS_WEEKNUMBERS)  {
     /* display weeknumbers*/
@@ -682 +682 @@
        LOCALE_IFIRSTWEEKOFYEAR == 0 (e.g US?):
        The week containing Jan 1 is the first week of year
-       LOCALE_IFIRSTWEEKOFYEAR == 2 (e.g. Germany):
+       LOCALE_IFIRSTWEEKOFYEAR == 2 (e.g. Germany): 
        First week of year must contain 4 days of the new year
        LOCALE_IFIRSTWEEKOFYEAR == 1  (what contries?)
@@ -688 +688 @@
     */
     GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTWEEKOFYEAR,
-             buf, sizeof(buf));
+                     buf, sizeof(buf));
     sscanf(buf, "%d", &weeknum);
     switch (weeknum)
       {
       case 1: mindays = 6;
-    break;
+        break;
       case 2: mindays = 3;
-    break;
+        break;
       case 0:
       default:
-    mindays = 0;
+        mindays = 0;
       }
     if (infoPtr->currentMonth < 2)
       {
-    /* calculate all those exceptions for january */
-    weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
-    if ((infoPtr->firstDay +7 - weeknum1)%7 > mindays)
-        weeknum =1;
-    else
-      {
-        weeknum = 0;
-        for(i=0; i<11; i++)
-          weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear-1);
-        weeknum +=startofprescal+ 7;
-        weeknum /=7;
-        weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear-1);
-        if ((infoPtr->firstDay + 7 - weeknum1)%7 > mindays)
-          weeknum++;
-      }
+        /* calculate all those exceptions for january */
+        weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
+        if ((infoPtr->firstDay +7 - weeknum1)%7 > mindays) 
+            weeknum =1;
+        else
+          {
+            weeknum = 0;
+            for(i=0; i<11; i++) 
+              weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear-1);
+            weeknum +=startofprescal+ 7;
+            weeknum /=7;
+            weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear-1);
+            if ((infoPtr->firstDay + 7 - weeknum1)%7 > mindays)
+              weeknum++;
+          }
       }
     else
       {
-    weeknum = 0;
-    for(i=0; i<prevMonth-1; i++)
-      weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear);
-    weeknum +=startofprescal+ 7;
-    weeknum /=7;
-    weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
-    if ((infoPtr->firstDay + 7 - weeknum1)%7 > mindays)
-      weeknum++;
+        weeknum = 0;
+        for(i=0; i<prevMonth-1; i++) 
+          weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear);
+        weeknum +=startofprescal+ 7;
+        weeknum /=7;
+        weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
+        if ((infoPtr->firstDay + 7 - weeknum1)%7 > mindays)
+          weeknum++;
       }
     days->left = infoPtr->weeknums.left;
@@ -735 +735 @@
     for(i=0; i<6; i++) {
       if((i==0)&&(weeknum>50))
-    {
-      sprintf(buf, "%d", weeknum);
-      weeknum=0;
-    }
+        {
+          sprintf(buf, "%d", weeknum);
+          weeknum=0;
+        }
       else if((i==5)&&(weeknum>47))
-    {
-      sprintf(buf, "%d", 1);
-    }
+        {
+          sprintf(buf, "%d", 1);
+        }
       else
-    sprintf(buf, "%d", weeknum + i);
+        sprintf(buf, "%d", weeknum + i);
       DrawTextA(hdc, buf, -1, days, DT_CENTER | DT_VCENTER | DT_SINGLELINE );
       days->top+=infoPtr->height_increment;
       days->bottom+=infoPtr->height_increment;
     }
-
+                        
     MoveToEx(hdc, infoPtr->weeknums.right, infoPtr->weeknums.top + 3 , NULL);
     LineTo(hdc,   infoPtr->weeknums.right, infoPtr->weeknums.bottom );
-
+                
   }
   /* currentFont was font at entering Refresh */
 
   SetBkColor(hdc, oldBkColor);
-  SelectObject(hdc, currentFont);
+  SelectObject(hdc, currentFont);     
   SetTextColor(hdc, oldTextColor);
 }
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetMinReqRect(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -768 +768 @@
   LPRECT lpRect = (LPRECT) lParam;
   TRACE("%x %lx\n", wParam, lParam);
-
+        
   /* validate parameters */
 
@@ -781 +781 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetColor(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -807 +807 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetColor(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -847 +847 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetMonthDelta(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -853 +853 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-
+  
   if(infoPtr->delta)
     return infoPtr->delta;
@@ -861 +861 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetMonthDelta(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -868 +868 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-
+        
   infoPtr->delta = (int)wParam;
   return prev;
@@ -874 +874 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetFirstDayOfWeek(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(hwnd);
-
+        
   return infoPtr->firstDay;
 }
@@ -887 +887 @@
 /* FIXME: this needs to be implemented properly in MONTHCAL_Refresh() */
 /* FIXME: we need more error checking here */
-static LRESULT
+static LRESULT 
 MONTHCAL_SetFirstDayOfWeek(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -903 +903 @@
     {
       GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK,
-             buf, sizeof(buf));
+                     buf, sizeof(buf));
       TRACE("%s %d\n", buf, strlen(buf));
       if(sscanf(buf, "%d", &day) == 1)
-    infoPtr->firstDay = day;
+        infoPtr->firstDay = day;
       else
-    infoPtr->firstDay = 0;
+        infoPtr->firstDay = 0;
     }
   return prev;
@@ -916 +916 @@
 /* FIXME: fill this in */
 static LRESULT
-MONTHCAL_GetMonthRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
+MONTHCAL_GetMonthRange(HWND hwnd, WPARAM wParam, LPARAM lParam) 
 {
   MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(hwnd);
@@ -937 +937 @@
 
 /* FIXME: are validated times taken from current date/time or simply
- * copied?
+ * copied? 
  * FIXME:    check whether MCM_GETMONTHRANGE shows correct result after
  *            adjusting range with MCM_SETRANGE
@@ -950 +950 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-
+  
   if(wParam & GDTR_MAX) {
     if(MONTHCAL_ValidateTime(lprgSysTimeArray[1])){
@@ -973 +973 @@
   infoPtr->monthRange = infoPtr->maxDate.wMonth - infoPtr->minDate.wMonth;
 
-  if(infoPtr->monthRange!=prev) {
-    COMCTL32_ReAlloc(infoPtr->monthdayState,
-        infoPtr->monthRange * sizeof(MONTHDAYSTATE));
+  if(infoPtr->monthRange!=prev) { 
+        COMCTL32_ReAlloc(infoPtr->monthdayState, 
+                infoPtr->monthRange * sizeof(MONTHDAYSTATE));
   }
 
@@ -983 +983 @@
 
 /* CHECKME: At the moment, we copy ranges anyway,regardless of
- * infoPtr->rangeValid; a invalid range is simply filled with zeros in
+ * infoPtr->rangeValid; a invalid range is simply filled with zeros in 
  * SetRange.  Is this the right behavior?
 */
@@ -1015 +1015 @@
   if(iMonths!=infoPtr->monthRange) return 0;
 
-  for(i=0; i<iMonths; i++)
+  for(i=0; i<iMonths; i++) 
     infoPtr->monthdayState[i] = dayStates[i];
   return 1;
 }
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetCurSel(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1036 +1036 @@
 /* FIXME: if the specified date is not visible, make it visible */
 /* FIXME: redraw? */
-static LRESULT
+static LRESULT 
 MONTHCAL_SetCurSel(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1057 +1057 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetMaxSelCount(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1067 +1067 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetMaxSelCount(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1081 +1081 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetSelRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1100 +1100 @@
     return TRUE;
   }
-
+ 
   return FALSE;
 }
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetSelRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1124 +1124 @@
     return TRUE;
   }
-
+ 
   return FALSE;
 }
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetToday(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1145 +1145 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetToday(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1170 +1170 @@
   DWORD retval;
   int day,wday,wnum;
-
-
+  
+  
   x = lpht->pt.x;
   y = lpht->pt.y;
   retval = MCHT_NOWHERE;
-
-
-  /* Comment in for debugging...
-  TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y,
-    infoPtr->wdays.left, infoPtr->wdays.right,
-    infoPtr->wdays.top, infoPtr->wdays.bottom,
-    infoPtr->days.left, infoPtr->days.right,
-    infoPtr->days.top, infoPtr->days.bottom,
-    infoPtr->todayrect.left, infoPtr->todayrect.right,
-    infoPtr->todayrect.top, infoPtr->todayrect.bottom,
-    infoPtr->weeknums.left, infoPtr->weeknums.right,
-    infoPtr->weeknums.top, infoPtr->weeknums.bottom);
+  
+
+  /* Comment in for debugging... 
+  TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y, 
+        infoPtr->wdays.left, infoPtr->wdays.right,
+        infoPtr->wdays.top, infoPtr->wdays.bottom,
+        infoPtr->days.left, infoPtr->days.right,
+        infoPtr->days.top, infoPtr->days.bottom,
+        infoPtr->todayrect.left, infoPtr->todayrect.right,
+        infoPtr->todayrect.top, infoPtr->todayrect.bottom,
+        infoPtr->weeknums.left, infoPtr->weeknums.right,
+        infoPtr->weeknums.top, infoPtr->weeknums.bottom);
   */
 
   /* are we in the header? */
-
+  
   if(PtInRect(&infoPtr->title, lpht->pt)) {
     if(PtInRect(&infoPtr->titlebtnprev, lpht->pt)) {
@@ -1208 +1208 @@
       goto done;
     }
-
+    
     retval = MCHT_TITLE;
     goto done;
   }
-
+  
   day = MONTHCAL_CalcDayFromPos(infoPtr,x,y,&wday,&wnum);
   if(PtInRect(&infoPtr->wdays, lpht->pt)) {
@@ -1218 +1218 @@
     lpht->st.wYear  = infoPtr->currentYear;
     lpht->st.wMonth = (day < 1)? infoPtr->currentMonth -1 : infoPtr->currentMonth;
-    lpht->st.wDay   = (day < 1)?
+    lpht->st.wDay   = (day < 1)? 
       MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day : day;
     goto done;
   }
-  if(PtInRect(&infoPtr->weeknums, lpht->pt)) {
-    retval = MCHT_CALENDARWEEKNUM;
+  if(PtInRect(&infoPtr->weeknums, lpht->pt)) {  
+    retval = MCHT_CALENDARWEEKNUM; 
     lpht->st.wYear  = infoPtr->currentYear;
-    lpht->st.wMonth = (day < 1) ? infoPtr->currentMonth -1 :
-      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ?
+    lpht->st.wMonth = (day < 1) ? infoPtr->currentMonth -1 : 
+      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ? 
       infoPtr->currentMonth +1 :infoPtr->currentMonth;
-    lpht->st.wDay   = (day < 1 ) ?
-      MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day :
-      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ?
+    lpht->st.wDay   = (day < 1 ) ? 
+      MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day : 
+      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ? 
       day - MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear) : day;
-    goto done;
-  }
-  if(PtInRect(&infoPtr->days, lpht->pt))
+    goto done;                              
+  }
+  if(PtInRect(&infoPtr->days, lpht->pt)) 
     {
       lpht->st.wYear  = infoPtr->currentYear;
-      if ( day < 1)
-    {
-      retval = MCHT_CALENDARDATEPREV;
-      lpht->st.wMonth = infoPtr->currentMonth - 1;
-      if (lpht->st.wMonth <1)
-        {
-          lpht->st.wMonth = 12;
-          lpht->st.wYear--;
-        }
-      lpht->st.wDay   = MONTHCAL_MonthLength(lpht->st.wMonth,lpht->st.wYear) -day;
-    }
+      if ( day < 1) 
+        {
+          retval = MCHT_CALENDARDATEPREV;
+          lpht->st.wMonth = infoPtr->currentMonth - 1;
+          if (lpht->st.wMonth <1)
+            {
+              lpht->st.wMonth = 12;
+              lpht->st.wYear--;
+            }
+          lpht->st.wDay   = MONTHCAL_MonthLength(lpht->st.wMonth,lpht->st.wYear) -day;
+        }
       else if (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear))
-    {
-      retval = MCHT_CALENDARDATENEXT;
-      lpht->st.wMonth = infoPtr->currentMonth + 1;
-      if (lpht->st.wMonth <12)
-        {
-          lpht->st.wMonth = 1;
-          lpht->st.wYear++;
-        }
-      lpht->st.wDay   = day - MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear) ;
-    }
+        {
+          retval = MCHT_CALENDARDATENEXT;
+          lpht->st.wMonth = infoPtr->currentMonth + 1;
+          if (lpht->st.wMonth <12)
+            {
+              lpht->st.wMonth = 1;
+              lpht->st.wYear++;
+            }
+          lpht->st.wDay   = day - MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear) ;
+        }
       else {
-    retval = MCHT_CALENDARDATE;
-    lpht->st.wMonth = infoPtr->currentMonth;
-    lpht->st.wDay   = day;
+        retval = MCHT_CALENDARDATE;
+        lpht->st.wMonth = infoPtr->currentMonth;
+        lpht->st.wDay   = day;
       }
       goto done;
     }
   if(PtInRect(&infoPtr->todayrect, lpht->pt)) {
-    retval = MCHT_TODAYLINK;
+    retval = MCHT_TODAYLINK; 
     goto done;
   }
-
-
+  
+  
   /* Hit nothing special? What's left must be background :-) */
-
-  retval = MCHT_CALENDARBK;
- done:
+  
+  retval = MCHT_CALENDARBK;       
+ done: 
   lpht->uHit = retval;
   return retval;
@@ -1300 +1300 @@
     nmds.nmhdr.idFrom   = GetWindowLongA(hwnd, GWL_ID);
     nmds.nmhdr.code     = MCN_GETDAYSTATE;
-    nmds.cDayState  = infoPtr->monthRange;
-    nmds.prgDayState    = COMCTL32_Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE));
+    nmds.cDayState      = infoPtr->monthRange;
+    nmds.prgDayState    = COMCTL32_Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE));
 
     SendMessageA(GetParent(hwnd), WM_NOTIFY,
@@ -1330 +1330 @@
     nmds.nmhdr.idFrom   = GetWindowLongA(hwnd, GWL_ID);
     nmds.nmhdr.code     = MCN_GETDAYSTATE;
-    nmds.cDayState  = infoPtr->monthRange;
-    nmds.prgDayState    = COMCTL32_Alloc
+    nmds.cDayState      = infoPtr->monthRange;
+    nmds.prgDayState    = COMCTL32_Alloc 
                         (infoPtr->monthRange * sizeof(MONTHDAYSTATE));
 
@@ -1348 +1348 @@
   POINT menupoint;
   char buf[32];
-
+  
   hMenu = CreatePopupMenu();
   if (!LoadStringA(COMCTL32_hModule,IDM_GOTODAY,buf,sizeof(buf)))
@@ -1360 +1360 @@
   ClientToScreen(hwnd, &menupoint);
   if( TrackPopupMenu(hMenu,TPM_RIGHTBUTTON| TPM_NONOTIFY|TPM_RETURNCMD,
-             menupoint.x,menupoint.y,0,hwnd,NULL))
+                     menupoint.x,menupoint.y,0,hwnd,NULL))
     {
       infoPtr->currentMonth=infoPtr->todaysDate.wMonth;
       infoPtr->currentYear=infoPtr->todaysDate.wYear;
       InvalidateRect(hwnd, NULL, FALSE);
-    }
+    }   
   return 0;
 }
@@ -1381 +1381 @@
   POINT menupoint;
   TRACE("%x %lx\n", wParam, lParam);
-
+        
   if (infoPtr->hWndYearUpDown)
     {
       infoPtr->currentYear=SendMessageA( infoPtr->hWndYearUpDown, UDM_SETPOS,   (WPARAM) 0,(LPARAM)0);
       if(!DestroyWindow(infoPtr->hWndYearUpDown))
-    {
-      FIXME("Can't destroy Updown Control\n");
-    }
+        {
+          FIXME("Can't destroy Updown Control\n");
+        }
       else
-    infoPtr->hWndYearUpDown=0;
+        infoPtr->hWndYearUpDown=0;
       if(!DestroyWindow(infoPtr->hWndYearEdit))
-    {
-      FIXME("Can't destroy Updown Control\n");
-    }
+        {
+          FIXME("Can't destroy Updown Control\n");
+        }
       else
-    infoPtr->hWndYearEdit=0;
+        infoPtr->hWndYearEdit=0;
       InvalidateRect(hwnd, NULL, FALSE);
     }
-
+  
   ht.pt.x = (INT)LOWORD(lParam);
   ht.pt.y = (INT)HIWORD(lParam);
@@ -1414 +1414 @@
     return TRUE;
   }
-  if(hit == MCHT_TITLEBTNPREV){
+  if(hit == MCHT_TITLEBTNPREV){ 
     MONTHCAL_GoToPrevMonth(hwnd, infoPtr);
     infoPtr->status = MC_PREVPRESSED;
@@ -1424 +1424 @@
   if(hit == MCHT_TITLEMONTH) {
     hMenu = CreatePopupMenu();
-
+    
     for (i=0; i<12;i++)
       {
-    GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SMONTHNAME1+i,
-          buf,sizeof(buf));
-    AppendMenuA(hMenu, MF_STRING|MF_ENABLED,i+1, buf);
+        GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SMONTHNAME1+i,
+                  buf,sizeof(buf));
+        AppendMenuA(hMenu, MF_STRING|MF_ENABLED,i+1, buf);
       }
     menupoint.x=infoPtr->titlemonth.right;
@@ -1435 +1435 @@
     ClientToScreen(hwnd, &menupoint);
     i= TrackPopupMenu(hMenu,TPM_LEFTALIGN | TPM_NONOTIFY | TPM_RIGHTBUTTON | TPM_RETURNCMD,
-              menupoint.x,menupoint.y,0,hwnd,NULL);
+                      menupoint.x,menupoint.y,0,hwnd,NULL);
     if ((i>0) && (i<13))
       {
-    infoPtr->currentMonth=i;
-    InvalidateRect(hwnd, NULL, FALSE);
+        infoPtr->currentMonth=i;
+        InvalidateRect(hwnd, NULL, FALSE);
       }
   }
   if(hit == MCHT_TITLEYEAR) {
     infoPtr->hWndYearEdit=CreateWindowExA(0,
-             "EDIT",
-               0,
-             WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT,
-             infoPtr->titleyear.left+3,infoPtr->titlebtnnext.top,
-             infoPtr->titleyear.right-infoPtr->titleyear.left,
-             infoPtr->textHeight,
-             hwnd,
-             (HMENU)NULL,
-             (HINSTANCE)NULL,
-             NULL);
+                         "EDIT",
+                           0,
+                         WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT,
+                         infoPtr->titleyear.left+3,infoPtr->titlebtnnext.top,
+                         infoPtr->titleyear.right-infoPtr->titleyear.left,
+                         infoPtr->textHeight,
+                         hwnd,
+                         (HMENU)NULL, 
+                         (HINSTANCE)NULL, 
+                         NULL);
     infoPtr->hWndYearUpDown=CreateWindowExA(0,
-             UPDOWN_CLASSA,
-               0,
-             WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT|UDS_NOTHOUSANDS|UDS_ARROWKEYS,
-             infoPtr->titleyear.right+6,infoPtr->titlebtnnext.top,
-             20,
-             infoPtr->textHeight,
-             hwnd,
-             (HMENU)NULL,
-             (HINSTANCE)NULL,
-             NULL);
+                         UPDOWN_CLASSA,
+                           0,
+                         WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT|UDS_NOTHOUSANDS|UDS_ARROWKEYS,
+                         infoPtr->titleyear.right+6,infoPtr->titlebtnnext.top,
+                         20,
+                         infoPtr->textHeight,
+                         hwnd,
+                         (HMENU)NULL, 
+                         (HINSTANCE)NULL, 
+                         NULL);
     SendMessageA( infoPtr->hWndYearUpDown, UDM_SETRANGE, (WPARAM) 0, MAKELONG (9999, 1753));
     SendMessageA( infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM) infoPtr->hWndYearEdit, (LPARAM)0 );
     SendMessageA( infoPtr->hWndYearUpDown, UDM_SETPOS,   (WPARAM) 0,(LPARAM)infoPtr->currentYear );
     return TRUE;
-
+         
   }
   if(hit == MCHT_TODAYLINK) {
@@ -1487 +1487 @@
     MONTHCAL_CopyTime(&nmsc.stSelStart, &infoPtr->minSel);
     MONTHCAL_CopyTime(&nmsc.stSelEnd, &infoPtr->maxSel);
-
+        
     SendMessageA(GetParent(hwnd), WM_NOTIFY,
            (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc);
@@ -1493 +1493 @@
     MONTHCAL_CopyTime(&ht.st, &selArray[0]);
     MONTHCAL_CopyTime(&ht.st, &selArray[1]);
-    MONTHCAL_SetSelRange(hwnd,0,(LPARAM) &selArray);
+    MONTHCAL_SetSelRange(hwnd,0,(LPARAM) &selArray); 
 
     /* redraw both old and new days if the selected day changed */
@@ -1546 +1546 @@
     return TRUE;
   }
-  if(hit == MCHT_CALENDARDATEPREV){
+  if(hit == MCHT_CALENDARDATEPREV){ 
     MONTHCAL_GoToPrevMonth(hwnd, infoPtr);
     InvalidateRect(hwnd, NULL, FALSE);
@@ -1564 +1564 @@
   MONTHCAL_CopyTime(&nmsc.stSelStart, &infoPtr->minSel);
   MONTHCAL_CopyTime(&nmsc.stSelEnd, &infoPtr->maxSel);
-
+        
   SendMessageA(GetParent(hwnd), WM_NOTIFY,
            (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
-
+  
   /* redraw if necessary */
   if(redraw)
     InvalidateRect(hwnd, NULL, FALSE);
-
+        
   return 0;
 }
@@ -1586 +1586 @@
 
   switch(wParam) {
-  case MC_NEXTMONTHTIMER:
+  case MC_NEXTMONTHTIMER: 
     redraw = TRUE;
     MONTHCAL_GoToNextMonth(hwnd, infoPtr);
@@ -1618 +1618 @@
   ht.pt.x = LOWORD(lParam);
   ht.pt.y = HIWORD(lParam);
-
+        
   hit = MONTHCAL_HitTest(hwnd, (LPARAM)&ht);
-
+  
   /* not on the calendar date numbers? bail out */
   TRACE("hit:%x\n",hit);
@@ -1638 +1638 @@
     if(infoPtr->firstSelDay==selArray[0].wDay) i=1;
     TRACE("oldRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i);
-    if(infoPtr->firstSelDay==selArray[1].wDay) {
+    if(infoPtr->firstSelDay==selArray[1].wDay) {  
       /* 1st time we get here: selArray[0]=selArray[1])  */
       /* if we're still at the first selected date, return */
@@ -1644 +1644 @@
       if(selday<infoPtr->firstSelDay) i = 0;
     }
-
+                        
     if(abs(infoPtr->firstSelDay - selday) >= infoPtr->maxSelCount) {
       if(selday>infoPtr->firstSelDay)
@@ -1651 +1651 @@
         selday = infoPtr->firstSelDay - infoPtr->maxSelCount;
     }
-
+                
     if(selArray[i].wDay!=selday) {
       TRACE("newRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i);
-
+                        
       selArray[i].wDay = selday;
 
@@ -1712 +1712 @@
 {
   TRACE("\n");
-
+  
   InvalidateRect(hwnd, NULL, FALSE);
 
@@ -1769 +1769 @@
 
   /* recalculate the height and width increments and offsets */
-  /* FIXME: We use up all available width. This will inhibit having multiple
-     calendars in a row, like win doesn
+  /* FIXME: We use up all available width. This will inhibit having multiple 
+     calendars in a row, like win doesn 
   */
   if(dwStyle & MCS_WEEKNUMBERS)
@@ -1776 +1776 @@
   else
     xdiv=7.0;
-  infoPtr->width_increment = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) / xdiv;
-  infoPtr->height_increment = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) / 10.0;
+  infoPtr->width_increment = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) / xdiv; 
+  infoPtr->height_increment = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) / 10.0; 
   infoPtr->left_offset = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) - (infoPtr->width_increment * xdiv);
   infoPtr->top_offset = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) - (infoPtr->height_increment * 10.0);
@@ -1790 +1790 @@
     rcDraw->bottom = rcDraw->top + 9 * infoPtr->textHeight + 5;
     }*/
-
+   
   /* calculate title area */
   title->top    = rcClient->top;
@@ -1805 +1805 @@
   next->right  = title->right - 6;
   next->left   = next->right - (title->bottom - title->top);
-
+  
   /* titlemonth->left and right change based upon the current month */
   /* and are recalculated in refresh as the current month may change */
@@ -1811 +1811 @@
   titlemonth->top    = titleyear->top    = title->top    + (infoPtr->height_increment)/2;
   titlemonth->bottom = titleyear->bottom = title->bottom - (infoPtr->height_increment)/2;
-
+  
   /* setup the dimensions of the rectangle we draw the names of the */
   /* days of the week in */
   weeknumrect->left =infoPtr->left_offset;
-  if(dwStyle & MCS_WEEKNUMBERS)
+  if(dwStyle & MCS_WEEKNUMBERS)  
     weeknumrect->right=prev->right;
   else
@@ -1823 +1823 @@
   wdays->top    = title->bottom ;
   wdays->bottom = wdays->top + infoPtr->height_increment;
-
+  
   days->top    = weeknumrect->top = wdays->bottom ;
   days->bottom = weeknumrect->bottom = days->top     + 6 * infoPtr->height_increment;
-
+  
   todayrect->left   = rcClient->left;
   todayrect->right  = rcClient->right;
@@ -1832 +1832 @@
   todayrect->bottom = days->bottom + infoPtr->height_increment;
 
-  /* uncomment for excessive debugging
+  /* uncomment for excessive debugging 
   TRACE("dx=%d dy=%d rcC[%d %d %d %d] t[%d %d %d %d] wd[%d %d %d %d] w[%d %d %d %d] t[%d %d %d %d]\n",
-    infoPtr->width_increment,infoPtr->height_increment,
-     rcClient->left, rcClient->right, rcClient->top, rcClient->bottom,
-        title->left,    title->right,    title->top,    title->bottom,
-        wdays->left,    wdays->right,    wdays->top,    wdays->bottom,
-         days->left,     days->right,     days->top,     days->bottom,
-    todayrect->left,todayrect->right,todayrect->top,todayrect->bottom);
+        infoPtr->width_increment,infoPtr->height_increment,
+         rcClient->left, rcClient->right, rcClient->top, rcClient->bottom,
+            title->left,    title->right,    title->top,    title->bottom,
+            wdays->left,    wdays->right,    wdays->top,    wdays->bottom,
+             days->left,     days->right,     days->top,     days->bottom,
+        todayrect->left,todayrect->right,todayrect->top,todayrect->bottom);
   */
-
+  
   /* restore the originally selected font */
-  SelectObject(hdc, currentFont);
+  SelectObject(hdc, currentFont);     
 
   ReleaseDC(hwnd, hdc);
@@ -1865 +1865 @@
 {
   MONTHCAL_INFO *infoPtr;
-  LOGFONTA  logFont;
+  LOGFONTA      logFont;
 
   /* allocate memory for info structure */
@@ -1900 +1900 @@
   infoPtr->maxSelCount  = 7;
   infoPtr->monthRange = 3;
-  infoPtr->monthdayState = COMCTL32_Alloc
+  infoPtr->monthdayState = COMCTL32_Alloc 
                          (infoPtr->monthRange * sizeof(MONTHDAYSTATE));
   infoPtr->titlebk     = GetSysColor(COLOR_ACTIVECAPTION);
@@ -1907 +1907 @@
   infoPtr->trailingtxt = GetSysColor(COLOR_GRAYTEXT);
   infoPtr->bk          = GetSysColor(COLOR_WINDOW);
-  infoPtr->txt         = GetSysColor(COLOR_WINDOWTEXT);
+  infoPtr->txt         = GetSysColor(COLOR_WINDOWTEXT);
 
   /* call MONTHCAL_UpdateSize to set all of the dimensions */
@@ -2062 +2062 @@
   wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
   wndClass.lpszClassName = MONTHCAL_CLASSA;
-
+ 
   RegisterClassA(&wndClass);
 }