diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-03-30 19:47:16 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-06-10 15:25:44 +0100 |
| commit | be201ac257687355bf0916d7c525d598ed9b1282 (patch) | |
| tree | 324de722075d608ed804762cd2a0486afcd7f6de /hw/xwin | |
| parent | fc40f9a92cf5981bccc45bbc0b959cc06c5accc2 (diff) | |
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>
Diffstat (limited to 'hw/xwin')
| -rw-r--r-- | hw/xwin/winmultiwindowicons.c | 2 | ||||
| -rw-r--r-- | hw/xwin/winprefs.c | 5 | ||||
| -rw-r--r-- | hw/xwin/winprefs.h | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index 0322d9816..bcc5688df 100644 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -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 diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index 6cbd7ad80..05d8c874d 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -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; diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h index 5de5719e1..a4a6e7eec 100644 --- a/hw/xwin/winprefs.h +++ b/hw/xwin/winprefs.h @@ -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); |