winemac: Don't try to set the app icon before GDI is properly initialized.
This commit is contained in:
parent
0669a8aca2
commit
e4a43cfa1f
|
@ -90,20 +90,6 @@ const char* debugstr_cf(CFTypeRef t)
|
|||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* set_app_icon
|
||||
*/
|
||||
static void set_app_icon(void)
|
||||
{
|
||||
CFArrayRef images = create_app_icon_images();
|
||||
if (images)
|
||||
{
|
||||
macdrv_set_application_icon(images);
|
||||
CFRelease(images);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* get_config_key
|
||||
*
|
||||
|
@ -208,7 +194,6 @@ static BOOL process_attach(void)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
set_app_icon();
|
||||
macdrv_clipboard_process_attach();
|
||||
|
||||
return TRUE;
|
||||
|
|
|
@ -929,6 +929,20 @@ void activate_on_following_focus(void)
|
|||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* set_app_icon
|
||||
*/
|
||||
static void set_app_icon(void)
|
||||
{
|
||||
CFArrayRef images = create_app_icon_images();
|
||||
if (images)
|
||||
{
|
||||
macdrv_set_application_icon(images);
|
||||
CFRelease(images);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**********************************************************************
|
||||
* CreateDesktopWindow (MACDRV.@)
|
||||
*/
|
||||
|
@ -968,6 +982,7 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd)
|
|||
SERVER_END_REQ;
|
||||
}
|
||||
|
||||
set_app_icon();
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue