Commit 46d007ce authored by Michael Kaufmann's avatar Michael Kaufmann Committed by Alexandre Julliard

static control: Support SS_REALSIZEIMAGE.

- Support SS_REALSIZEIMAGE (this flag means "it's not necessary to load icons in the default icon size"). - SS_ICON: Ability to display cursors.
parent 66b5020e
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
* TODO: * TODO:
* *
* Styles * Styles
* - SS_REALSIZEIMAGE
* - SS_RIGHTJUST * - SS_RIGHTJUST
* *
* Notifications * Notifications
...@@ -206,12 +205,23 @@ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, ...@@ -206,12 +205,23 @@ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile,
* *
* Load the icon for an SS_ICON control. * Load the icon for an SS_ICON control.
*/ */
static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name ) static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name, DWORD style )
{ {
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
HICON hicon = LoadIconA( hInstance, name ); if ((style & SS_REALSIZEIMAGE) != 0)
if (!hicon) hicon = LoadIconA( 0, name ); {
return hicon; return LoadImageA(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED);
}
else
{
HICON hicon = LoadIconA( hInstance, name );
if (!hicon) hicon = LoadCursorA( hInstance, name );
if (!hicon) hicon = LoadIconA( 0, name );
/* Windows doesn't try to load a standard cursor,
probably because most IDs for standard cursors conflict
with the IDs for standard icons anyway */
return hicon;
}
} }
/*********************************************************************** /***********************************************************************
...@@ -219,12 +229,23 @@ static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name ) ...@@ -219,12 +229,23 @@ static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name )
* *
* Load the icon for an SS_ICON control. * Load the icon for an SS_ICON control.
*/ */
static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name ) static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name, DWORD style )
{ {
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
HICON hicon = LoadIconW( hInstance, name ); if ((style & SS_REALSIZEIMAGE) != 0)
if (!hicon) hicon = LoadIconW( 0, name ); {
return hicon; return LoadImageW(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED);
}
else
{
HICON hicon = LoadIconW( hInstance, name );
if (!hicon) hicon = LoadCursorW( hInstance, name );
if (!hicon) hicon = LoadIconW( 0, name );
/* Windows doesn't try to load a standard cursor,
probably because most IDs for standard cursors conflict
with the IDs for standard icons anyway */
return hicon;
}
} }
/*********************************************************************** /***********************************************************************
...@@ -368,9 +389,9 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, ...@@ -368,9 +389,9 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam,
{ {
HICON hIcon; HICON hIcon;
if(unicode) if(unicode)
hIcon = STATIC_LoadIconW(hwnd, (LPCWSTR)lParam); hIcon = STATIC_LoadIconW(hwnd, (LPCWSTR)lParam, full_style);
else else
hIcon = STATIC_LoadIconA(hwnd, (LPCSTR)lParam); hIcon = STATIC_LoadIconA(hwnd, (LPCSTR)lParam, full_style);
/* FIXME : should we also return the previous hIcon here ??? */ /* FIXME : should we also return the previous hIcon here ??? */
STATIC_SetIcon(hwnd, hIcon, full_style); STATIC_SetIcon(hwnd, hIcon, full_style);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment