user32: Don't put a default icon on modal dialogs.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
4d1192ad89
commit
9a28e35064
|
@ -168,10 +168,10 @@ static HICON NC_IconForWindow( HWND hwnd )
|
||||||
if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICONSM );
|
if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICONSM );
|
||||||
if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICON );
|
if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICON );
|
||||||
|
|
||||||
/* If there is no hIcon specified and this is a modal dialog,
|
/* If there is no icon specified and this is not a modal dialog,
|
||||||
* get the default one.
|
* get the default one.
|
||||||
*/
|
*/
|
||||||
if (!hIcon && (GetWindowLongW( hwnd, GWL_STYLE ) & DS_MODALFRAME))
|
if (!hIcon && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_DLGMODALFRAME))
|
||||||
hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON),
|
hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON),
|
||||||
GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);
|
GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);
|
||||||
return hIcon;
|
return hIcon;
|
||||||
|
|
Loading…
Reference in New Issue