Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 16:43:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32] -Add helper functions for setting and retrieving the button bitmap.

Browse source 
svn path=/trunk/; revision=73902
This commit is contained in:
Giannis Adamopoulos 2017-02-25 11:05:19 +00:00
parent 6868358a85
commit 6579ca96ea
1 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
reactos/dll/win32/comctl32/button.c
View file

@ -207,6 +207,16 @@ HRGN set_control_clipping( HDC hdc, const RECT *rect )
BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag); BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag);
static inline LONG_PTR get_button_image(HWND hwnd)
{
return GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET );
}
static inline LONG_PTR set_button_image(HWND hwnd, LONG_PTR image)
{
return SetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET, image );
}
#endif #endif
static inline HFONT get_button_font( HWND hwnd ) static inline HFONT get_button_font( HWND hwnd )
@ -697,12 +707,20 @@ LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg,
default: default:
return 0; return 0;
} }
#ifdef _USER32_
oldHbitmap = (HBITMAP)SetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET, lParam ); oldHbitmap = (HBITMAP)SetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET, lParam );
#else
oldHbitmap = (HBITMAP)set_button_image(hWnd, lParam );
#endif
InvalidateRect( hWnd, NULL, FALSE ); InvalidateRect( hWnd, NULL, FALSE );
return (LRESULT)oldHbitmap; return (LRESULT)oldHbitmap;
case BM_GETIMAGE: case BM_GETIMAGE:
#ifdef _USER32_
return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET ); return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET );
#else
return get_button_image(hWnd);
#endif
case BM_GETCHECK: case BM_GETCHECK:
return get_button_state( hWnd ) & 3; return get_button_state( hWnd ) & 3;
@ -886,7 +904,11 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
} }
case BS_ICON: case BS_ICON:
#ifdef _USER32_
if (!GetIconInfo((HICON)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo)) if (!GetIconInfo((HICON)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo))
#else
if (!GetIconInfo((HICON)get_button_image(hwnd), &iconInfo))
#endif
goto empty_rect; goto empty_rect;
GetObjectW (iconInfo.hbmColor, sizeof(BITMAP), &bm); GetObjectW (iconInfo.hbmColor, sizeof(BITMAP), &bm);
@ -899,7 +921,11 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
break; break;
case BS_BITMAP: case BS_BITMAP:
#ifdef _USER32_
if (!GetObjectW( (HANDLE)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), sizeof(BITMAP), &bm)) if (!GetObjectW( (HANDLE)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), sizeof(BITMAP), &bm))
#else
if (!GetObjectW( (HANDLE)get_button_image(hwnd), sizeof(BITMAP), &bm))
#endif
goto empty_rect; goto empty_rect;
r.right = r.left + bm.bmWidth; r.right = r.left + bm.bmWidth;
@ -1006,12 +1032,20 @@ static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc)
case BS_ICON: case BS_ICON:
flags |= DST_ICON; flags |= DST_ICON;
#ifdef _USER32_
lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET );
#else
lp = get_button_image(hwnd);
#endif
break; break;
case BS_BITMAP: case BS_BITMAP:
flags |= DST_BITMAP; flags |= DST_BITMAP;
#ifdef _USER32_
lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET );
#else
lp = get_button_image(hwnd);
#endif
break; break;
default: default: