Implement proper GWL_STYLE handling, proper reaction to style changes.
Merge {{Inc,Dec}rement,Reset{Up,Down}}Field into one method. Fix a
bunch of bugs in the process. Implement DTM_[GS]ETMCFONT. Indentation
fixes, cleanups.
This commit is contained in:
Dimitrie O. Paun
Alexandre Julliard
parent
60865df566
commit
63fe9d4490
|
|
@ -36,16 +36,14 @@
|
|||
* -- DTN_FORMATQUERY
|
||||
* -- DTN_USERSTRING
|
||||
* -- DTN_WMKEYDOWN
|
||||
* -- DTM_GETMCFONT, DTM_SETMCFONT
|
||||
* -- FORMATCALLBACK
|
||||
* -- fix formatting
|
||||
* -- GWL_STYLE handling
|
||||
*/
|
||||
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
|
|
@ -65,6 +63,7 @@ typedef struct
|
|||
HWND hMonthCal;
|
||||
HWND hwndNotify;
|
||||
HWND hUpdown;
|
||||
DWORD dwStyle;
|
||||
SYSTEMTIME date;
|
||||
BOOL dateValid;
|
||||
HWND hwndCheckbut;
|
||||
|
|
@ -139,11 +138,9 @@ static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1,-1};
|
|||
static DWORD
|
||||
DATETIME_GetSystemTime (DATETIME_INFO *infoPtr, SYSTEMTIME *lprgSysTimeArray)
|
||||
{
|
||||
DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE);
|
||||
|
||||
if (!lprgSysTimeArray) return GDT_NONE;
|
||||
|
||||
if ((dwStyle & DTS_SHOWNONE) &&
|
||||
if ((infoPtr->dwStyle & DTS_SHOWNONE) &&
|
||||
(SendMessageW (infoPtr->hwndCheckbut, BM_GETCHECK, 0, 0) == BST_UNCHECKED))
|
||||
return GDT_NONE;
|
||||
|
||||
|
|
@ -171,18 +168,9 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, SYSTEMTIME *lprgSysT
|
|||
infoPtr->dateValid = FALSE;
|
||||
SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_UNCHECKED, 0);
|
||||
}
|
||||
|
||||
InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static DWORD
|
||||
DATETIME_GetRange (DATETIME_INFO *infoPtr, SYSTEMTIME *lprgSysTimeArray)
|
||||
{
|
||||
DWORD ret;
|
||||
|
||||
ret = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM)lprgSysTimeArray);
|
||||
if (!ret) ret = 1; /* bug emulation... */
|
||||
return ret;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -265,11 +253,10 @@ DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR lpszFormat)
|
|||
if (!lpszFormat) {
|
||||
WCHAR format_buf[80];
|
||||
DWORD format_item;
|
||||
DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE);
|
||||
|
||||
if (dwStyle & DTS_LONGDATEFORMAT)
|
||||
if (infoPtr->dwStyle & DTS_LONGDATEFORMAT)
|
||||
format_item = LOCALE_SLONGDATE;
|
||||
else if (dwStyle & DTS_TIMEFORMAT)
|
||||
else if (infoPtr->dwStyle & DTS_TIMEFORMAT)
|
||||
format_item = LOCALE_STIMEFORMAT;
|
||||
else /* DTS_SHORTDATEFORMAT */
|
||||
format_item = LOCALE_SSHORTDATE;
|
||||
|
|
@ -418,263 +405,79 @@ DATETIME_ReturnTxt (DATETIME_INFO *infoPtr, int count, LPWSTR result, int result
|
|||
TRACE ("arg%d=%x->[%s]\n", count, infoPtr->fieldspec[count], debugstr_w(result));
|
||||
}
|
||||
|
||||
static int wrap(int val, int delta, int minVal, int maxVal)
|
||||
{
|
||||
val += delta;
|
||||
if (delta == INT_MIN || val < minVal) return maxVal;
|
||||
if (delta == INT_MAX || val > maxVal) return minVal;
|
||||
return val;
|
||||
}
|
||||
|
||||
static void
|
||||
DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number)
|
||||
DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta)
|
||||
{
|
||||
SYSTEMTIME *date = &infoPtr->date;
|
||||
int spec;
|
||||
|
||||
TRACE ("%d\n", number);
|
||||
if ((number > infoPtr->nrFields) || (number < 0)) return;
|
||||
|
||||
spec=infoPtr->fieldspec[number];
|
||||
if ((spec & DTHT_DATEFIELD)==0) return;
|
||||
if ((infoPtr->fieldspec[number] & DTHT_DATEFIELD) == 0) return;
|
||||
|
||||
switch (spec) {
|
||||
case ONEDIGITDAY:
|
||||
case TWODIGITDAY:
|
||||
case THREECHARDAY:
|
||||
case FULLDAY:
|
||||
date->wDay++;
|
||||
if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
|
||||
date->wDay=1;
|
||||
break;
|
||||
case ONEDIGIT12HOUR:
|
||||
case TWODIGIT12HOUR:
|
||||
case ONEDIGIT24HOUR:
|
||||
case TWODIGIT24HOUR:
|
||||
date->wHour++;
|
||||
if (date->wHour>23) date->wHour=0;
|
||||
break;
|
||||
case ONEDIGITSECOND:
|
||||
case TWODIGITSECOND:
|
||||
date->wSecond++;
|
||||
if (date->wSecond>59) date->wSecond=0;
|
||||
break;
|
||||
case ONEDIGITMINUTE:
|
||||
case TWODIGITMINUTE:
|
||||
date->wMinute++;
|
||||
if (date->wMinute>59) date->wMinute=0;
|
||||
break;
|
||||
case ONEDIGITMONTH:
|
||||
case TWODIGITMONTH:
|
||||
case THREECHARMONTH:
|
||||
case FULLMONTH:
|
||||
date->wMonth++;
|
||||
if (date->wMonth>12) date->wMonth=1;
|
||||
if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
|
||||
date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
|
||||
break;
|
||||
case ONELETTERAMPM:
|
||||
case TWOLETTERAMPM:
|
||||
date->wHour+=12;
|
||||
if (date->wHour>23) date->wHour-=24;
|
||||
break;
|
||||
case FORMATCALLBACK:
|
||||
FIXME ("Not implemented\n");
|
||||
break;
|
||||
switch (infoPtr->fieldspec[number]) {
|
||||
case ONEDIGITYEAR:
|
||||
case TWODIGITYEAR:
|
||||
case FULLYEAR:
|
||||
date->wYear++;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
DATETIME_DecreaseField (DATETIME_INFO *infoPtr, int number)
|
||||
{
|
||||
SYSTEMTIME *date = & infoPtr->date;
|
||||
int spec;
|
||||
|
||||
TRACE ("%d\n",number);
|
||||
if ((number>infoPtr->nrFields) || (number<0)) return;
|
||||
|
||||
spec = infoPtr->fieldspec[number];
|
||||
if ((spec & DTHT_DATEFIELD)==0) return;
|
||||
|
||||
TRACE ("%x\n",spec);
|
||||
|
||||
switch (spec) {
|
||||
case ONEDIGITDAY:
|
||||
case TWODIGITDAY:
|
||||
case THREECHARDAY:
|
||||
case FULLDAY:
|
||||
date->wDay--;
|
||||
if (date->wDay<1)
|
||||
date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
|
||||
break;
|
||||
case ONEDIGIT12HOUR:
|
||||
case TWODIGIT12HOUR:
|
||||
case ONEDIGIT24HOUR:
|
||||
case TWODIGIT24HOUR:
|
||||
if (date->wHour)
|
||||
date->wHour--;
|
||||
else
|
||||
date->wHour=23;
|
||||
break;
|
||||
case ONEDIGITSECOND:
|
||||
case TWODIGITSECOND:
|
||||
if (date->wHour)
|
||||
date->wSecond--;
|
||||
else
|
||||
date->wHour=59;
|
||||
break;
|
||||
case ONEDIGITMINUTE:
|
||||
case TWODIGITMINUTE:
|
||||
if (date->wMinute)
|
||||
date->wMinute--;
|
||||
else
|
||||
date->wMinute=59;
|
||||
date->wYear = wrap(date->wYear, delta, 1752, 9999);
|
||||
break;
|
||||
case ONEDIGITMONTH:
|
||||
case TWODIGITMONTH:
|
||||
case THREECHARMONTH:
|
||||
case FULLMONTH:
|
||||
if (date->wMonth>1)
|
||||
date->wMonth--;
|
||||
else
|
||||
date->wMonth=12;
|
||||
if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
|
||||
date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
|
||||
break;
|
||||
case ONELETTERAMPM:
|
||||
case TWOLETTERAMPM:
|
||||
if (date->wHour<12)
|
||||
date->wHour+=12;
|
||||
else
|
||||
date->wHour-=12;
|
||||
break;
|
||||
case FORMATCALLBACK:
|
||||
FIXME ("Not implemented\n");
|
||||
break;
|
||||
case ONEDIGITYEAR:
|
||||
case TWODIGITYEAR:
|
||||
case FULLYEAR:
|
||||
date->wYear--;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
DATETIME_ResetFieldDown (DATETIME_INFO *infoPtr, int number)
|
||||
{
|
||||
SYSTEMTIME *date = &infoPtr->date;
|
||||
int spec;
|
||||
|
||||
TRACE ("%d\n",number);
|
||||
if ((number>infoPtr->nrFields) || (number<0)) return;
|
||||
|
||||
spec = infoPtr->fieldspec[number];
|
||||
if ((spec & DTHT_DATEFIELD)==0) return;
|
||||
|
||||
|
||||
switch (spec) {
|
||||
date->wMonth = wrap(date->wMonth, delta, 1, 12);
|
||||
delta = 0;
|
||||
/* fall through */
|
||||
case ONEDIGITDAY:
|
||||
case TWODIGITDAY:
|
||||
case THREECHARDAY:
|
||||
case FULLDAY:
|
||||
date->wDay = 1;
|
||||
date->wDay = wrap(date->wDay, delta, 1, MONTHCAL_MonthLength(date->wMonth, date->wYear));
|
||||
break;
|
||||
case ONELETTERAMPM:
|
||||
case TWOLETTERAMPM:
|
||||
delta *= 12;
|
||||
/* fall through */
|
||||
case ONEDIGIT12HOUR:
|
||||
case TWODIGIT12HOUR:
|
||||
case ONEDIGIT24HOUR:
|
||||
case TWODIGIT24HOUR:
|
||||
case ONELETTERAMPM:
|
||||
case TWOLETTERAMPM:
|
||||
date->wHour = 0;
|
||||
break;
|
||||
case ONEDIGITSECOND:
|
||||
case TWODIGITSECOND:
|
||||
date->wSecond = 0;
|
||||
date->wHour = wrap(date->wHour, delta, 0, 23);
|
||||
break;
|
||||
case ONEDIGITMINUTE:
|
||||
case TWODIGITMINUTE:
|
||||
date->wMinute = 0;
|
||||
date->wMinute = wrap(date->wMinute, delta, 0, 59);
|
||||
break;
|
||||
case ONEDIGITSECOND:
|
||||
case TWODIGITSECOND:
|
||||
date->wSecond = wrap(date->wSecond, delta, 0, 59);
|
||||
break;
|
||||
case ONEDIGITMONTH:
|
||||
case TWODIGITMONTH:
|
||||
case THREECHARMONTH:
|
||||
case FULLMONTH:
|
||||
date->wMonth = 1;
|
||||
case FORMATCALLBACK:
|
||||
FIXME ("Not implemented\n");
|
||||
break;
|
||||
case ONEDIGITYEAR:
|
||||
case TWODIGITYEAR:
|
||||
}
|
||||
|
||||
/* FYI: On 1752/9/14 the calendar changed and England and the
|
||||
* American colonies changed to the Gregorian calendar. This change
|
||||
* involved having September 14th follow September 2nd. So no date
|
||||
* algorithm works before that date.
|
||||
*/
|
||||
case FULLYEAR:
|
||||
if (10000 * date->wYear + 100 * date->wMonth + date->wDay < 17520914) {
|
||||
date->wYear = 1752;
|
||||
date->wMonth = 9;
|
||||
date->wDay = 14;
|
||||
date->wSecond = 0;
|
||||
date->wMinute = 0;
|
||||
date->wHour = 0;
|
||||
date->wDay = 14; /* overactive ms-programmers..*/
|
||||
date->wMonth = 9;
|
||||
date->wYear = 1752;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
DATETIME_ResetFieldUp (DATETIME_INFO *infoPtr, int number)
|
||||
{
|
||||
SYSTEMTIME *date = & infoPtr->date;
|
||||
int spec;
|
||||
|
||||
TRACE("%d \n",number);
|
||||
if ((number>infoPtr->nrFields) || (number<0)) return;
|
||||
|
||||
spec=infoPtr->fieldspec[number];
|
||||
if ((spec & DTHT_DATEFIELD)==0) return;
|
||||
|
||||
switch (spec) {
|
||||
case ONEDIGITDAY:
|
||||
case TWODIGITDAY:
|
||||
case THREECHARDAY:
|
||||
case FULLDAY:
|
||||
date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
|
||||
break;
|
||||
case ONEDIGIT12HOUR:
|
||||
case TWODIGIT12HOUR:
|
||||
case ONEDIGIT24HOUR:
|
||||
case TWODIGIT24HOUR:
|
||||
case ONELETTERAMPM:
|
||||
case TWOLETTERAMPM:
|
||||
date->wHour=23;
|
||||
break;
|
||||
case ONEDIGITSECOND:
|
||||
case TWODIGITSECOND:
|
||||
date->wSecond=59;
|
||||
break;
|
||||
case ONEDIGITMINUTE:
|
||||
case TWODIGITMINUTE:
|
||||
date->wMinute=59;
|
||||
break;
|
||||
case ONEDIGITMONTH:
|
||||
case TWODIGITMONTH:
|
||||
case THREECHARMONTH:
|
||||
case FULLMONTH:
|
||||
date->wMonth=12;
|
||||
case FORMATCALLBACK:
|
||||
FIXME ("Not implemented\n");
|
||||
break;
|
||||
case ONEDIGITYEAR:
|
||||
case TWODIGITYEAR:
|
||||
case FULLYEAR:
|
||||
date->wYear=9999; /* Y10K problem? naaah. */
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -683,7 +486,6 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc)
|
|||
{
|
||||
int i,prevright;
|
||||
RECT *field;
|
||||
DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE);
|
||||
RECT *rcDraw = &infoPtr->rcDraw;
|
||||
RECT *rcClient = &infoPtr->rcClient;
|
||||
RECT *calbutton = &infoPtr->calbutton;
|
||||
|
|
@ -700,19 +502,14 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc)
|
|||
DeleteObject(hbr);
|
||||
|
||||
if (infoPtr->dateValid) {
|
||||
HFONT oldFont = SelectObject (hdc, infoPtr->hFont);
|
||||
WCHAR txt[80];
|
||||
HFONT oldFont;
|
||||
oldFont = SelectObject (hdc, infoPtr->hFont);
|
||||
|
||||
DATETIME_ReturnTxt (infoPtr, 0, txt, sizeof(txt)/sizeof(txt[0]));
|
||||
GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size);
|
||||
rcDraw->bottom = size.cy + 2;
|
||||
|
||||
if (dwStyle & DTS_SHOWNONE)
|
||||
checkbox->right = 18;
|
||||
else
|
||||
checkbox->right = 2;
|
||||
prevright = checkbox->right;
|
||||
prevright = checkbox->right = ((infoPtr->dwStyle & DTS_SHOWNONE) ? 18 : 2);
|
||||
|
||||
for (i = 0; i < infoPtr->nrFields; i++) {
|
||||
DATETIME_ReturnTxt (infoPtr, i, txt, sizeof(txt)/sizeof(txt[0]));
|
||||
|
|
@ -730,23 +527,19 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc)
|
|||
oldBk = SetBkColor (hdc, GetSysColor(COLOR_ACTIVECAPTION));
|
||||
oldTextColor = SetTextColor (hdc, GetSysColor(COLOR_WINDOW));
|
||||
DeleteObject (hbr);
|
||||
DrawTextW ( hdc, txt, strlenW(txt), field,
|
||||
DT_RIGHT | DT_VCENTER | DT_SINGLELINE );
|
||||
DrawTextW (hdc, txt, strlenW(txt), field, DT_RIGHT | DT_VCENTER | DT_SINGLELINE);
|
||||
SetBkColor (hdc, oldBk);
|
||||
SetTextColor (hdc, oldTextColor);
|
||||
} else
|
||||
DrawTextW ( hdc, txt, strlenW(txt), field, DT_RIGHT | DT_VCENTER | DT_SINGLELINE );
|
||||
}
|
||||
else
|
||||
DrawTextW ( hdc, txt, strlenW(txt), field,
|
||||
DT_RIGHT | DT_VCENTER | DT_SINGLELINE );
|
||||
}
|
||||
|
||||
SelectObject (hdc, oldFont);
|
||||
}
|
||||
|
||||
if (!(dwStyle & DTS_UPDOWN)) {
|
||||
if (!(infoPtr->dwStyle & DTS_UPDOWN)) {
|
||||
DrawFrameControl(hdc, calbutton, DFC_SCROLL,
|
||||
DFCS_SCROLLDOWN | (infoPtr->bCalDepressed ? DFCS_PUSHED : 0) |
|
||||
(dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) );
|
||||
(infoPtr->dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -772,19 +565,15 @@ DATETIME_HitTest (DATETIME_INFO *infoPtr, POINT pt)
|
|||
static LRESULT
|
||||
DATETIME_LButtonDown (DATETIME_INFO *infoPtr, WORD wKey, POINTS pts)
|
||||
{
|
||||
DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE);
|
||||
POINT pt = { pts.x, pts.y };
|
||||
int old = infoPtr->select;
|
||||
int new = DATETIME_HitTest (infoPtr, pt);
|
||||
|
||||
TRACE ("\n");
|
||||
|
||||
/* FIXME: might be conditions where we don't want to update infoPtr->select */
|
||||
infoPtr->select = new;
|
||||
|
||||
if (infoPtr->select != old) {
|
||||
if (infoPtr->select != old)
|
||||
infoPtr->haveFocus = DTHT_GOTFOCUS;
|
||||
}
|
||||
|
||||
if (infoPtr->select == DTHT_MCPOPUP) {
|
||||
/* FIXME: button actually is only depressed during dropdown of the */
|
||||
|
|
@ -792,21 +581,20 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, WORD wKey, POINTS pts)
|
|||
infoPtr->bCalDepressed = TRUE;
|
||||
|
||||
/* recalculate the position of the monthcal popup */
|
||||
if(dwStyle & DTS_RIGHTALIGN)
|
||||
infoPtr->monthcal_pos.x = infoPtr->rcClient.right - ((infoPtr->calbutton.right -
|
||||
infoPtr->calbutton.left) + 200);
|
||||
if(infoPtr->dwStyle & DTS_RIGHTALIGN)
|
||||
infoPtr->monthcal_pos.x = infoPtr->rcClient.right -
|
||||
((infoPtr->calbutton.right - infoPtr->calbutton.left) + 200);
|
||||
else
|
||||
infoPtr->monthcal_pos.x = 8;
|
||||
|
||||
infoPtr->monthcal_pos.y = infoPtr->rcClient.bottom;
|
||||
ClientToScreen (infoPtr->hwndSelf, &(infoPtr->monthcal_pos));
|
||||
/* FIXME My Windoze has cx=about 200, but it probably depends on font size etc */
|
||||
SetWindowPos(infoPtr->hMonthCal, 0, infoPtr->monthcal_pos.x,
|
||||
infoPtr->monthcal_pos.y, 200, 150, 0);
|
||||
SetWindowPos(infoPtr->hMonthCal, 0, infoPtr->monthcal_pos.x, infoPtr->monthcal_pos.y, 200, 150, 0);
|
||||
|
||||
if(IsWindowVisible(infoPtr->hMonthCal))
|
||||
if(IsWindowVisible(infoPtr->hMonthCal)) {
|
||||
ShowWindow(infoPtr->hMonthCal, SW_HIDE);
|
||||
else {
|
||||
} else {
|
||||
SYSTEMTIME *lprgSysTimeArray = &infoPtr->date;
|
||||
TRACE("update calendar %04d/%02d/%02d\n",
|
||||
lprgSysTimeArray->wYear, lprgSysTimeArray->wMonth, lprgSysTimeArray->wDay);
|
||||
|
|
@ -898,11 +686,11 @@ DATETIME_Notify (DATETIME_INFO *infoPtr, int idCtrl, LPNMHDR lpnmh)
|
|||
static LRESULT
|
||||
DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode, LPARAM flags)
|
||||
{
|
||||
int FieldNum = infoPtr->select & DTHT_DATEFIELD;
|
||||
int fieldNum = infoPtr->select & DTHT_DATEFIELD;
|
||||
int wrap = 0;
|
||||
|
||||
if (!(infoPtr->haveFocus)) return 0;
|
||||
if ((FieldNum==0) && (infoPtr->select)) return 0;
|
||||
if ((fieldNum==0) && (infoPtr->select)) return 0;
|
||||
|
||||
if (infoPtr->select & FORMATCALLMASK) {
|
||||
FIXME ("Callbacks not implemented yet\n");
|
||||
|
|
@ -911,20 +699,20 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode, LPARAM flags)
|
|||
switch (vkCode) {
|
||||
case VK_ADD:
|
||||
case VK_UP:
|
||||
DATETIME_IncreaseField (infoPtr,FieldNum);
|
||||
DATETIME_IncreaseField (infoPtr, fieldNum, 1);
|
||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||
break;
|
||||
case VK_SUBTRACT:
|
||||
case VK_DOWN:
|
||||
DATETIME_DecreaseField (infoPtr,FieldNum);
|
||||
DATETIME_IncreaseField (infoPtr, fieldNum, -1);
|
||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||
break;
|
||||
case VK_HOME:
|
||||
DATETIME_ResetFieldDown (infoPtr,FieldNum);
|
||||
DATETIME_IncreaseField (infoPtr, fieldNum, INT_MIN);
|
||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||
break;
|
||||
case VK_END:
|
||||
DATETIME_ResetFieldUp(infoPtr,FieldNum);
|
||||
DATETIME_IncreaseField (infoPtr, fieldNum, INT_MAX);
|
||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||
break;
|
||||
case VK_LEFT:
|
||||
|
|
@ -932,10 +720,10 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode, LPARAM flags)
|
|||
if (infoPtr->select == 0) {
|
||||
infoPtr->select = infoPtr->nrFields - 1;
|
||||
wrap++;
|
||||
} else
|
||||
} else {
|
||||
infoPtr->select--;
|
||||
}
|
||||
while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
|
||||
} while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
|
||||
break;
|
||||
case VK_RIGHT:
|
||||
do {
|
||||
|
|
@ -944,8 +732,7 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode, LPARAM flags)
|
|||
infoPtr->select = 0;
|
||||
wrap++;
|
||||
}
|
||||
}
|
||||
while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
|
||||
} while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -986,14 +773,13 @@ DATETIME_SetFocus (DATETIME_INFO *infoPtr, HWND lostFocus)
|
|||
static BOOL
|
||||
DATETIME_SendDateTimeChangeNotify (DATETIME_INFO *infoPtr)
|
||||
{
|
||||
DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE);
|
||||
NMDATETIMECHANGE dtdtc;
|
||||
|
||||
dtdtc.nmhdr.hwndFrom = infoPtr->hwndSelf;
|
||||
dtdtc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID);
|
||||
dtdtc.nmhdr.code = DTN_DATETIMECHANGE;
|
||||
|
||||
dtdtc.dwFlags = (dwStyle & DTS_SHOWNONE) ? GDT_NONE : GDT_VALID;
|
||||
dtdtc.dwFlags = (infoPtr->dwStyle & DTS_SHOWNONE) ? GDT_NONE : GDT_VALID;
|
||||
|
||||
MONTHCAL_CopyTime (&infoPtr->date, &dtdtc.st);
|
||||
return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY,
|
||||
|
|
@ -1018,8 +804,6 @@ DATETIME_SendSimpleNotify (DATETIME_INFO *infoPtr, UINT code)
|
|||
static LRESULT
|
||||
DATETIME_Size (DATETIME_INFO *infoPtr, WORD flags, INT width, INT height)
|
||||
{
|
||||
DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE);
|
||||
|
||||
/* set size */
|
||||
infoPtr->rcClient.bottom = height;
|
||||
infoPtr->rcClient.right = width;
|
||||
|
|
@ -1046,7 +830,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, WORD flags, INT width, INT height)
|
|||
infoPtr->checkbox.right = infoPtr->rcDraw.left + 10;
|
||||
|
||||
/* update the position of the monthcal control */
|
||||
if(dwStyle & DTS_RIGHTALIGN)
|
||||
if(infoPtr->dwStyle & DTS_RIGHTALIGN)
|
||||
infoPtr->monthcal_pos.x = infoPtr->rcClient.right - ((infoPtr->calbutton.right -
|
||||
infoPtr->calbutton.left) + 145);
|
||||
else
|
||||
|
|
@ -1054,9 +838,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, WORD flags, INT width, INT height)
|
|||
|
||||
infoPtr->monthcal_pos.y = infoPtr->rcClient.bottom;
|
||||
ClientToScreen (infoPtr->hwndSelf, &(infoPtr->monthcal_pos));
|
||||
SetWindowPos(infoPtr->hMonthCal, 0, infoPtr->monthcal_pos.x,
|
||||
infoPtr->monthcal_pos.y,
|
||||
145, 150, 0);
|
||||
SetWindowPos(infoPtr->hMonthCal, 0, infoPtr->monthcal_pos.x, infoPtr->monthcal_pos.y, 145, 150, 0);
|
||||
|
||||
InvalidateRect(infoPtr->hwndSelf, NULL, FALSE);
|
||||
|
||||
|
|
@ -1065,35 +847,52 @@ DATETIME_Size (DATETIME_INFO *infoPtr, WORD flags, INT width, INT height)
|
|||
|
||||
|
||||
static LRESULT
|
||||
DATETIME_Create (HWND hwnd, LPCREATESTRUCTW lpcs)
|
||||
DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, LPSTYLESTRUCT lpss)
|
||||
{
|
||||
static const WCHAR buttonW[] = { 'b', 'u', 't', 't', 'o', 'n', 0 };
|
||||
static const WCHAR SysMonthCal32W[] = { 'S', 'y', 's', 'M', 'o', 'n', 't', 'h', 'C', 'a', 'l', '3', '2', 0 };
|
||||
DATETIME_INFO *infoPtr;
|
||||
DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
|
||||
|
||||
/* allocate memory for info structure */
|
||||
infoPtr = (DATETIME_INFO *)Alloc (sizeof(DATETIME_INFO));
|
||||
TRACE("(styletype=%x, styleOld=0x%08lx, styleNew=0x%08lx)\n",
|
||||
wStyleType, lpss->styleOld, lpss->styleNew);
|
||||
|
||||
if (wStyleType != GWL_STYLE) return 0;
|
||||
|
||||
infoPtr->dwStyle = lpss->styleNew;
|
||||
|
||||
if ( !(lpss->styleOld & DTS_SHOWNONE) && (lpss->styleNew & DTS_SHOWNONE) ) {
|
||||
infoPtr->hwndCheckbut = CreateWindowExW (0, buttonW, 0, WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
|
||||
2, 2, 13, 13, infoPtr->hwndSelf, 0,
|
||||
(HINSTANCE)GetWindowLongPtrW (infoPtr->hwndSelf, GWLP_HINSTANCE), 0);
|
||||
SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, 1, 0);
|
||||
}
|
||||
if ( (lpss->styleOld & DTS_SHOWNONE) && !(lpss->styleNew & DTS_SHOWNONE) ) {
|
||||
DestroyWindow(infoPtr->hwndCheckbut);
|
||||
infoPtr->hwndCheckbut = 0;
|
||||
}
|
||||
if ( !(lpss->styleOld & DTS_UPDOWN) && (lpss->styleNew & DTS_UPDOWN) ) {
|
||||
infoPtr->hUpdown = CreateUpDownControl (WS_CHILD | WS_BORDER | WS_VISIBLE, 120, 1, 20, 20,
|
||||
infoPtr->hwndSelf, 1, 0, 0, UD_MAXVAL, UD_MINVAL, 0);
|
||||
}
|
||||
if ( (lpss->styleOld & DTS_UPDOWN) && !(lpss->styleNew & DTS_UPDOWN) ) {
|
||||
DestroyWindow(infoPtr->hUpdown);
|
||||
infoPtr->hUpdown = 0;
|
||||
}
|
||||
|
||||
InvalidateRect(infoPtr->hwndSelf, NULL, TRUE);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static LRESULT
|
||||
DATETIME_Create (HWND hwnd, LPCREATESTRUCTW lpcs)
|
||||
{
|
||||
static const WCHAR SysMonthCal32W[] = { 'S', 'y', 's', 'M', 'o', 'n', 't', 'h', 'C', 'a', 'l', '3', '2', 0 };
|
||||
DATETIME_INFO *infoPtr = (DATETIME_INFO *)Alloc (sizeof(DATETIME_INFO));
|
||||
STYLESTRUCT ss = { 0, lpcs->style };
|
||||
|
||||
if (!infoPtr) return -1;
|
||||
|
||||
infoPtr->hwndSelf = hwnd;
|
||||
|
||||
if (dwStyle & DTS_SHOWNONE) {
|
||||
infoPtr->hwndCheckbut=CreateWindowExW (0, buttonW, 0,
|
||||
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
|
||||
2,2,13,13,
|
||||
hwnd,
|
||||
0, (HINSTANCE)GetWindowLongPtrW (hwnd, GWLP_HINSTANCE), 0);
|
||||
SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, 1, 0);
|
||||
}
|
||||
|
||||
if (dwStyle & DTS_UPDOWN) {
|
||||
infoPtr->hUpdown=CreateUpDownControl (
|
||||
WS_CHILD | WS_BORDER | WS_VISIBLE,
|
||||
120,1,20,20,
|
||||
hwnd,1,0,0,
|
||||
UD_MAXVAL, UD_MINVAL, 0);
|
||||
}
|
||||
infoPtr->dwStyle = lpcs->style;
|
||||
|
||||
infoPtr->nrFieldsAllocated = 32;
|
||||
infoPtr->fieldspec = (int *) Alloc (infoPtr->nrFieldsAllocated * sizeof(int));
|
||||
|
|
@ -1101,14 +900,12 @@ DATETIME_Create (HWND hwnd, LPCREATESTRUCTW lpcs)
|
|||
infoPtr->buflen = (int *) Alloc (infoPtr->nrFieldsAllocated * sizeof(int));
|
||||
infoPtr->hwndNotify = lpcs->hwndParent;
|
||||
|
||||
DATETIME_StyleChanged(infoPtr, GWL_STYLE, &ss);
|
||||
DATETIME_SetFormatW (infoPtr, 0);
|
||||
|
||||
/* create the monthcal control */
|
||||
infoPtr->hMonthCal = CreateWindowExW (0, SysMonthCal32W, 0,
|
||||
WS_BORDER | WS_POPUP | WS_CLIPSIBLINGS,
|
||||
0, 0, 0, 0,
|
||||
hwnd,
|
||||
0, 0, 0);
|
||||
infoPtr->hMonthCal = CreateWindowExW (0, SysMonthCal32W, 0, WS_BORDER | WS_POPUP | WS_CLIPSIBLINGS,
|
||||
0, 0, 0, 0, infoPtr->hwndSelf, 0, 0, 0);
|
||||
|
||||
/* initialize info structure */
|
||||
GetSystemTime (&infoPtr->date);
|
||||
|
|
@ -1121,9 +918,14 @@ DATETIME_Create (HWND hwnd, LPCREATESTRUCTW lpcs)
|
|||
}
|
||||
|
||||
|
||||
|
||||
static LRESULT
|
||||
DATETIME_Destroy (DATETIME_INFO *infoPtr)
|
||||
{
|
||||
if (infoPtr->hwndCheckbut)
|
||||
DestroyWindow(infoPtr->hwndCheckbut);
|
||||
if (infoPtr->hUpdown)
|
||||
DestroyWindow(infoPtr->hUpdown);
|
||||
if (infoPtr->hMonthCal)
|
||||
DestroyWindow(infoPtr->hMonthCal);
|
||||
SetWindowLongPtrW( infoPtr->hwndSelf, 0, 0 ); /* clear infoPtr */
|
||||
|
|
@ -1136,14 +938,14 @@ static LRESULT WINAPI
|
|||
DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0));
|
||||
LRESULT ret;
|
||||
|
||||
TRACE ("%x, %x, %lx\n", uMsg, wParam, lParam);
|
||||
|
||||
if (!infoPtr && (uMsg != WM_CREATE))
|
||||
return DefWindowProcW( hwnd, uMsg, wParam, lParam );
|
||||
|
||||
switch (uMsg)
|
||||
{
|
||||
switch (uMsg) {
|
||||
|
||||
case DTM_GETSYSTEMTIME:
|
||||
return DATETIME_GetSystemTime (infoPtr, (SYSTEMTIME *) lParam);
|
||||
|
|
@ -1152,7 +954,8 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
|||
return DATETIME_SetSystemTime (infoPtr, wParam, (SYSTEMTIME *) lParam);
|
||||
|
||||
case DTM_GETRANGE:
|
||||
return DATETIME_GetRange(infoPtr, (SYSTEMTIME *) lParam);
|
||||
ret = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, wParam, lParam);
|
||||
return ret ? ret : 1; /* bug emulation */
|
||||
|
||||
case DTM_SETRANGE:
|
||||
return SendMessageW (infoPtr->hMonthCal, MCM_SETRANGE, wParam, lParam);
|
||||
|
|
@ -1163,22 +966,20 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
|||
case DTM_SETFORMATW:
|
||||
return DATETIME_SetFormatW (infoPtr, (LPCWSTR)lParam);
|
||||
|
||||
case DTM_GETMONTHCAL:
|
||||
return (LRESULT)infoPtr->hMonthCal;
|
||||
|
||||
case DTM_SETMCCOLOR:
|
||||
return SendMessageW (infoPtr->hMonthCal, MCM_SETCOLOR, wParam, lParam);
|
||||
|
||||
case DTM_GETMCCOLOR:
|
||||
return SendMessageW (infoPtr->hMonthCal, MCM_GETCOLOR, wParam, 0);
|
||||
|
||||
case DTM_GETMONTHCAL:
|
||||
return (LRESULT)infoPtr->hMonthCal;
|
||||
|
||||
case DTM_SETMCFONT:
|
||||
FIXME("DTM_SETMCFONT: stub\n");
|
||||
return 0;
|
||||
return SendMessageW (infoPtr->hMonthCal, WM_SETFONT, wParam, lParam);
|
||||
|
||||
case DTM_GETMCFONT:
|
||||
FIXME("DTM_GETMCFONT: stub\n");
|
||||
return 0;
|
||||
return SendMessageW (infoPtr->hMonthCal, WM_GETFONT, wParam, lParam);
|
||||
|
||||
case WM_NOTIFY:
|
||||
return DATETIME_Notify (infoPtr, (int)wParam, (LPNMHDR)lParam);
|
||||
|
|
@ -1216,6 +1017,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
|||
case WM_COMMAND:
|
||||
return DATETIME_Command (infoPtr, wParam, lParam);
|
||||
|
||||
case WM_STYLECHANGED:
|
||||
return DATETIME_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam);
|
||||
|
||||
default:
|
||||
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
|
||||
ERR("unknown msg %04x wp=%08x lp=%08lx\n",
|
||||
|
|
|
|||
Loading…
Reference in New Issue