diff options
| author | Pietro Gagliardi <[email protected]> | 2014-11-14 22:41:25 -0500 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2014-11-14 22:41:25 -0500 |
| commit | f11b1141fbda7b236982b1ecfad160c80736b07b (patch) | |
| tree | db6a0058762ec50976afde5e4195c4ec99ab5512 /wintable/imagelist_windows.c | |
| parent | ee1309313636576131e44fa55986bce75f0098a3 (diff) | |
Stored the checkbox width/height in the new Windows Table. This will be needed for hit-testing checkboxes.
Diffstat (limited to 'wintable/imagelist_windows.c')
| -rw-r--r-- | wintable/imagelist_windows.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wintable/imagelist_windows.c b/wintable/imagelist_windows.c index c97fc0f..2527d16 100644 --- a/wintable/imagelist_windows.c +++ b/wintable/imagelist_windows.c @@ -148,9 +148,8 @@ static HBITMAP makeCheckboxImageListEntry(HDC dc, int width, int height, int cbS return bitmap; } -static HIMAGELIST newCheckboxImageList(HWND hwnddc, void (*sizefunc)(HDC, int *, int *, HTHEME), void (*drawfunc)(HDC, RECT *, int, HTHEME), HTHEME theme) +static HIMAGELIST newCheckboxImageList(HWND hwnddc, void (*sizefunc)(HDC, int *, int *, HTHEME), void (*drawfunc)(HDC, RECT *, int, HTHEME), HTHEME theme, int *width, int *height) { - int width, height; int cbState; HDC dc; HIMAGELIST il; @@ -176,7 +175,7 @@ static HIMAGELIST newCheckboxImageList(HWND hwnddc, void (*sizefunc)(HDC, int *, return il; } -HIMAGELIST makeCheckboxImageList(HWND hwnddc, HTHEME *theme) +HIMAGELIST makeCheckboxImageList(HWND hwnddc, HTHEME *theme, int *width, int *height) { if (*theme != NULL) { HRESULT res; @@ -190,7 +189,7 @@ HIMAGELIST makeCheckboxImageList(HWND hwnddc, HTHEME *theme) if (*theme == NULL) // try to open the theme *theme = OpenThemeData(hwnddc, L"button"); if (*theme != NULL) // use the theme - return newCheckboxImageList(hwnddc, themeSize, themeImage, *theme); + return newCheckboxImageList(hwnddc, themeSize, themeImage, *theme, width, height); // couldn't open; fall back - return newCheckboxImageList(hwnddc, dfcSize, dfcImage, *theme); + return newCheckboxImageList(hwnddc, dfcSize, dfcImage, *theme, width, height); } |
