ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32: Fix first day of the week in monthcal.

This commit is contained in:
Lei Zhang 2007-04-09 18:25:41 -07:00 committed by Alexandre Julliard
parent 824e452a9e
commit 6fb16fca6b
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/comctl32/monthcal.c
View File

@ -94,6 +94,7 @@ typedef struct
/* control moves when user clicks a scroll button */ /* control moves when user clicks a scroll button */
int visible; /* # of months visible */ int visible; /* # of months visible */
int firstDay; /* Start month calendar with firstDay's day */ int firstDay; /* Start month calendar with firstDay's day */
int firstDayHighWord; /* High word only used externally */
int monthRange; int monthRange;
MONTHDAYSTATE *monthdayState; MONTHDAYSTATE *monthdayState;
SYSTEMTIME todaysDate; SYSTEMTIME todaysDate;
@ -885,7 +886,7 @@ MONTHCAL_SetMonthDelta(MONTHCAL_INFO *infoPtr, WPARAM wParam)
static LRESULT static LRESULT
MONTHCAL_GetFirstDayOfWeek(const MONTHCAL_INFO *infoPtr) MONTHCAL_GetFirstDayOfWeek(const MONTHCAL_INFO *infoPtr)
{ {
return infoPtr->firstDay; return MAKELONG(infoPtr->firstDay, infoPtr->firstDayHighWord);
} }
@ -896,7 +897,7 @@ MONTHCAL_GetFirstDayOfWeek(const MONTHCAL_INFO *infoPtr)
static LRESULT static LRESULT
MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam)
{ {
int prev = infoPtr->firstDay; int prev = MAKELONG(infoPtr->firstDay, infoPtr->firstDayHighWord);
int localFirstDay; int localFirstDay;
WCHAR buf[40]; WCHAR buf[40];
@ -908,11 +909,20 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam)
localFirstDay = atoiW(buf); localFirstDay = atoiW(buf);
if(lParam == -1) if(lParam == -1)
infoPtr->firstDay = MAKELONG(localFirstDay, FALSE); {
infoPtr->firstDay = localFirstDay;
infoPtr->firstDayHighWord = FALSE;
}
else if(lParam >= 7) else if(lParam >= 7)
infoPtr->firstDay = MAKELONG(localFirstDay, TRUE); {
infoPtr->firstDay = localFirstDay;
infoPtr->firstDayHighWord = TRUE;
}
else else
infoPtr->firstDay = MAKELONG(lParam, TRUE); {
infoPtr->firstDay = lParam;
infoPtr->firstDayHighWord = TRUE;
}
return prev; return prev;
} }
@ -1879,6 +1889,7 @@ MONTHCAL_Create(HWND hwnd, WPARAM wParam, LPARAM lParam)
/* FIXME: calculate systemtime ->> localtime(substract timezoneinfo) */ /* FIXME: calculate systemtime ->> localtime(substract timezoneinfo) */
GetLocalTime(&infoPtr->todaysDate); GetLocalTime(&infoPtr->todaysDate);
infoPtr->firstDayHighWord = FALSE;
MONTHCAL_SetFirstDayOfWeek(infoPtr, (LPARAM)-1); MONTHCAL_SetFirstDayOfWeek(infoPtr, (LPARAM)-1);
infoPtr->currentMonth = infoPtr->todaysDate.wMonth; infoPtr->currentMonth = infoPtr->todaysDate.wMonth;
infoPtr->currentYear = infoPtr->todaysDate.wYear; infoPtr->currentYear = infoPtr->todaysDate.wYear;