Alexandre Julliard : winex11: Get the icon from the window in case it was changed before the whole window was created .
Module: wine Branch: master Commit: e929e3b603d0f375c4ae986137ae561131cc131e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e929e3b603d0f375c4ae986137... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 16:40:54 2008 +0100 winex11: Get the icon from the window in case it was changed before the whole window was created. --- dlls/winex11.drv/window.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index aa860ee..c52d13a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -849,8 +849,10 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data if (data->wm_hints) { + HICON icon = (HICON)SendMessageW( data->hwnd, WM_GETICON, ICON_BIG, 0 ); + if (!icon) icon = (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ); data->wm_hints->flags = 0; - set_icon_hints( display, data, (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ) ); + set_icon_hints( display, data, icon ); } }
participants (1)
-
Alexandre Julliard