diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/hw/xwin/winprefs.h | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winprefs.h')
| -rw-r--r-- | xorg-server/hw/xwin/winprefs.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/winprefs.h b/xorg-server/hw/xwin/winprefs.h index 996b02ade..abfc7434e 100644 --- a/xorg-server/hw/xwin/winprefs.h +++ b/xorg-server/hw/xwin/winprefs.h @@ -105,7 +105,7 @@ typedef struct ICONITEM { char match[MENU_MAX+1]; /* What string to search for? */ char iconFile[PATH_MAX+NAME_MAX+2]; /* Icon location, WIN32 path */ - unsigned long hicon; /* LoadImage() result */ + HICON hicon; /* LoadImage() result */ } ICONITEM; /* To redefine styles for certain window types */ @@ -172,15 +172,18 @@ HandleCustomWM_COMMAND (unsigned long hwndIn, int winIconIsOverride (unsigned hiconIn); -unsigned long +HICON winOverrideIcon (unsigned long longpWin); unsigned long winOverrideStyle (unsigned long longpWin); unsigned long +winOverrideStyle (unsigned long longpWin); + +HICON winTaskbarIcon(void); -unsigned long +HICON winOverrideDefaultIcon(int size); #endif |