diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2007-04-22 11:25:07 +0000 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2007-04-22 11:25:07 +0000 |
| commit | 862eba86664cdcda0aaf17e34b58193912c8d05d (patch) | |
| tree | 6c6b0f3ef785ec616514fa67824403f251e2f5d8 /winsup/w32api/include/shellapi.h | |
| parent | f1fc3a03b4aaa970b6f1c21794400b1e4738214c (diff) | |
| download | cygnal-862eba86664cdcda0aaf17e34b58193912c8d05d.tar.gz cygnal-862eba86664cdcda0aaf17e34b58193912c8d05d.tar.bz2 cygnal-862eba86664cdcda0aaf17e34b58193912c8d05d.zip | |
2007-04-22 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* include/shellapi.h (NOTIFYICONDATAA, NOTIFYICONDATAW): Updated to support
Vista.
Diffstat (limited to 'winsup/w32api/include/shellapi.h')
| -rw-r--r-- | winsup/w32api/include/shellapi.h | 78 |
1 files changed, 42 insertions, 36 deletions
diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h index b7d524581..282f61d11 100644 --- a/winsup/w32api/include/shellapi.h +++ b/winsup/w32api/include/shellapi.h @@ -151,54 +151,60 @@ typedef struct _AppBarData { DECLARE_HANDLE(HDROP); typedef struct _NOTIFYICONDATAA { - DWORD cbSize; - HWND hWnd; - UINT uID; - UINT uFlags; - UINT uCallbackMessage; - HICON hIcon; + DWORD cbSize; + HWND hWnd; + UINT uID; + UINT uFlags; + UINT uCallbackMessage; + HICON hIcon; #if _WIN32_IE >= 0x0500 - CHAR szTip[128]; - DWORD dwState; - DWORD dwStateMask; - CHAR szInfo[256]; - _ANONYMOUS_UNION union { - UINT uTimeout; - UINT uVersion; - } DUMMYUNIONNAME; - CHAR szInfoTitle[64]; - DWORD dwInfoFlags; + CHAR szTip[128]; + DWORD dwState; + DWORD dwStateMask; + CHAR szInfo[256]; + _ANONYMOUS_UNION union { + UINT uTimeout; + UINT uVersion; + } DUMMYUNIONNAME; + CHAR szInfoTitle[64]; + DWORD dwInfoFlags; #else - CHAR szTip[64]; + CHAR szTip[64]; #endif #if _WIN32_IE >= 0x600 - GUID guidItem; + GUID guidItem; +#endif +#if _WIN32_WINNT >= 0x600 + HICON hBalloonIcon; #endif } NOTIFYICONDATAA,*PNOTIFYICONDATAA; typedef struct _NOTIFYICONDATAW { - DWORD cbSize; - HWND hWnd; - UINT uID; - UINT uFlags; - UINT uCallbackMessage; - HICON hIcon; + DWORD cbSize; + HWND hWnd; + UINT uID; + UINT uFlags; + UINT uCallbackMessage; + HICON hIcon; #if _WIN32_IE >= 0x0500 - WCHAR szTip[128]; - DWORD dwState; - DWORD dwStateMask; - WCHAR szInfo[256]; - _ANONYMOUS_UNION union { - UINT uTimeout; - UINT uVersion; - } DUMMYUNIONNAME; - WCHAR szInfoTitle[64]; - DWORD dwInfoFlags; + WCHAR szTip[128]; + DWORD dwState; + DWORD dwStateMask; + WCHAR szInfo[256]; + _ANONYMOUS_UNION union { + UINT uTimeout; + UINT uVersion; + } DUMMYUNIONNAME; + WCHAR szInfoTitle[64]; + DWORD dwInfoFlags; #else - WCHAR szTip[64]; + WCHAR szTip[64]; #endif #if _WIN32_IE >= 0x600 - GUID guidItem; + GUID guidItem; +#endif +#if _WIN32_WINNT >= 0x600 + HICON hBalloonIcon; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW; |