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

comdlg32: Fix parsing of the margin edit controls.

This commit is contained in:
Huw Davies 2009-01-19 14:11:20 +00:00 committed by Alexandre Julliard
parent 11e028be8e
commit 5f15c1c12e
1 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dlls/comdlg32/printdlg.c
View File

@ -2856,14 +2856,6 @@ PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda)
return TRUE; return TRUE;
} }
#define GETVAL(idc,val) \
if(msg == EN_CHANGE){ \
if (GetDlgItemTextA(hDlg,idc,buf,sizeof(buf)) > 0)\
val = _c_str2sizeA(pda->dlga,buf); \
else\
FIXME("could not get dlgitemtexta for %x\n",id); \
}
static inline LONG *element_from_margin_id(RECT *rc, WORD id) static inline LONG *element_from_margin_id(RECT *rc, WORD id)
{ {
switch(id) switch(id)
@ -2891,6 +2883,50 @@ static void update_margin_edits(HWND hDlg, const PageSetupDataA *pda, WORD id)
} }
} }
static void margin_edit_notification(HWND hDlg, PageSetupDataA *pda, WORD msg, WORD id)
{
switch (msg)
{
case EN_CHANGE:
{
WCHAR buf[10];
LONG val = 0;
LONG *value = element_from_margin_id(&pda->dlga->rtMargin, id);
if (GetDlgItemTextW(hDlg, id, buf, sizeof(buf) / sizeof(buf[0])) != 0)
{
WCHAR *end;
WCHAR decimal = '.';
val = strtolW(buf, &end, 10);
if(end != buf || *end == decimal)
{
int mult = is_metric(pda) ? 100 : 1000;
val *= mult;
if(*end == decimal)
{
while(mult > 1)
{
end++;
mult /= 10;
if(isdigitW(*end))
val += (*end - '0') * mult;
else
break;
}
}
}
}
*value = val;
return;
}
case EN_KILLFOCUS:
update_margin_edits(hDlg, pda, id);
return;
}
}
static void set_margin_groupbox_title(HWND hDlg, const PageSetupDataA *pda) static void set_margin_groupbox_title(HWND hDlg, const PageSetupDataA *pda)
{ {
WCHAR title[256]; WCHAR title[256];
@ -2917,8 +2953,7 @@ PRINTDLG_PS_WMCommandA(
) { ) {
WORD msg = HIWORD(wParam); WORD msg = HIWORD(wParam);
WORD id = LOWORD(wParam); WORD id = LOWORD(wParam);
char buf[200];
TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n", TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
LOWORD(lParam),wParam,lParam); LOWORD(lParam),wParam,lParam);
switch (id) { switch (id) {
@ -3047,22 +3082,15 @@ PRINTDLG_PS_WMCommandA(
break; break;
} }
case edt4: case edt4:
GETVAL(id, pda->dlga->rtMargin.left);
break;
case edt5: case edt5:
GETVAL(id, pda->dlga->rtMargin.top);
break;
case edt6: case edt6:
GETVAL(id, pda->dlga->rtMargin.right);
break;
case edt7: case edt7:
GETVAL(id, pda->dlga->rtMargin.bottom); margin_edit_notification(hDlg, pda, msg, id);
break; break;
} }
InvalidateRect(GetDlgItem(hDlg, rct1), NULL, TRUE); InvalidateRect(GetDlgItem(hDlg, rct1), NULL, TRUE);
return FALSE; return FALSE;
} }
#undef GETVAL
static BOOL static BOOL
PRINTDLG_PS_WMCommandW( PRINTDLG_PS_WMCommandW(