hw/xwin: Change winIconIsOverride() to take a HICON parameter
Change winIconIsOverride() to take a HICON parameter, so some unneccessary casts, which weren't portable to 64-bit Cygwin, can be removed. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
fc40f9a92c
commit
be201ac257
|
@ -624,7 +624,7 @@ winDestroyIcon(HICON hIcon)
|
|||
/* Delete the icon if its not one of the application defaults or an override */
|
||||
if (hIcon &&
|
||||
hIcon != g_hIconX &&
|
||||
hIcon != g_hSmallIconX && !winIconIsOverride((unsigned long) hIcon))
|
||||
hIcon != g_hSmallIconX && !winIconIsOverride(hIcon))
|
||||
DestroyIcon(hIcon);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -617,13 +617,10 @@ winOverrideIcon(char *res_name, char *res_class, char *wmName)
|
|||
* ICONS{} overrides)?
|
||||
*/
|
||||
int
|
||||
winIconIsOverride(unsigned hiconIn)
|
||||
winIconIsOverride(HICON hicon)
|
||||
{
|
||||
HICON hicon;
|
||||
int i;
|
||||
|
||||
hicon = (HICON) hiconIn;
|
||||
|
||||
if (!hicon)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -162,7 +162,7 @@ Bool
|
|||
HandleCustomWM_COMMAND(unsigned long hwndIn, int command);
|
||||
|
||||
int
|
||||
winIconIsOverride(unsigned hiconIn);
|
||||
winIconIsOverride(HICON hicon);
|
||||
|
||||
HICON winOverrideIcon(char *res_name, char *res_class, char *wmName);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user