[PATCH v2] comctl32/datetime: Change DATETIME_ReturnFieldWidth() to return width.
Huw Davies
huw at codeweavers.com
Mon Mar 26 04:05:54 CDT 2018
On Sat, Mar 24, 2018 at 12:17:50PM +0800, Zhiyi Zhang wrote:
> @@ -752,7 +744,7 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc)
> for (i = 0; i < infoPtr->nrFields; i++) {
> DATETIME_ReturnTxt (infoPtr, i, txt, ARRAY_SIZE(txt));
> GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size);
> - DATETIME_ReturnFieldWidth (infoPtr, hdc, i, &fieldWidth);
> + fieldWidth = DATETIME_ReturnFieldWidth (infoPtr, hdc, i);
> field = &infoPtr->fieldRect[i];
> field->left = prevright;
> field->right = prevright + fieldWidth;
You could eliminate 'fieldWidth' entirely rather like you do below
with 'width'.
While you're at it, you could rename DATETIME_ReturnFieldWidth() to
DATETIME_GetFieldWidth().
> @@ -1458,7 +1450,6 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size)
> {
> SIZE field_size;
> RECT rect;
> - SHORT width;
> WCHAR txt[80];
> HDC hdc;
> HFONT oldFont;
> @@ -1477,8 +1468,7 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size)
> /* Get text font width */
> for (i = 0; i < infoPtr->nrFields; i++)
> {
> - DATETIME_ReturnFieldWidth(infoPtr, hdc, i, &width);
> - size->cx += width;
> + size->cx += DATETIME_ReturnFieldWidth(infoPtr, hdc, i);
> }
>
> SelectObject(hdc, oldFont);
>
More information about the wine-devel
mailing list