Alexandre Julliard : winemac: Don' t try to set the app icon before GDI is properly initialized.
Alexandre Julliard
julliard at winehq.org
Thu Oct 24 13:18:56 CDT 2013
Module: wine
Branch: master
Commit: e4a43cfa1f44b4458bd347ce473846daa18f9326
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a43cfa1f44b4458bd347ce473846daa18f9326
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Oct 24 16:48:12 2013 +0200
winemac: Don't try to set the app icon before GDI is properly initialized.
---
dlls/winemac.drv/macdrv_main.c | 15 ---------------
dlls/winemac.drv/window.c | 15 +++++++++++++++
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index df45bb5..5cdd13c 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -91,20 +91,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
*
* Get a config key from either the app-specific or the default config
@@ -208,7 +194,6 @@ static BOOL process_attach(void)
return FALSE;
}
- set_app_icon();
macdrv_clipboard_process_attach();
return TRUE;
diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index 007d5b0..4e132fa 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -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;
}
More information about the wine-cvs
mailing list