* include/shellapi.h (NOTIFYICONDATA_V*_SIZE): Define.

	Thanks to:  Daniel Atallah <datallah at users dot sf dot net>
	* include/shellapi.h  [_WIN32_IE >= 0x0500]
	(NIS_*): Introduced in Version 5.0.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c6d86bf..1e97ba9 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+       * include/shellapi.h (NOTIFYICONDATA_V*_SIZE): Define.
+       Thanks to:  Daniel Atallah <datallah at users dot sf dot net>
+       * include/shellapi.h  [_WIN32_IE >= 0x0500]
+       (NIS_*): Introduced in Version 5.0.
+
 2006-03-06  Danny Smith  <dannysmith@users.sourceforge.net>
        * include/wingdi.h (CS_*): Correct WINVER guard on
        Image Color Matching colour definitions.

diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index 9abdf99..6eb98df 100644 (file)
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -46,7 +46,7 @@ extern "C" {
 #define NIM_ADD        0
 #define NIM_MODIFY     1
 #define NIM_DELETE     2
-#if _WIN32_IE >= 0x0500
+#if (_WIN32_IE >= 0x0500)
 #define NOTIFYICON_VERSION 3
 #define NIM_SETFOCUS   3
 #define NIM_SETVERSION 4
@@ -71,8 +71,10 @@ extern "C" {
 #define NIIF_ICON_MASK 0x0000000F
 #define NIIF_NOSOUND   0x00000010
 #endif
-#define NIS_HIDDEN     1
-#define NIS_SHAREDICON 2
+#if (_WIN32_IE >= 0x0500)
+#define NIS_HIDDEN     0x00000001
+#define NIS_SHAREDICON 0x00000002
+#endif
 #define SE_ERR_FNF     2
 #define SE_ERR_PNF     3
 #define SE_ERR_ACCESSDENIED    5
@@ -123,6 +125,13 @@ extern "C" {
 #define SHERB_NOCONFIRMATION 1
 #define SHERB_NOPROGRESSUI 2
 #define SHERB_NOSOUND 4
+#ifdef UNICODE
+#define NOTIFYICONDATA_V2_SIZE 936
+#define NOTIFYICONDATA_V1_SIZE 152
+#else
+#define NOTIFYICONDATA_V2_SIZE 488
+#define NOTIFYICONDATA_V1_SIZE 88
+#endif
 
 typedef WORD FILEOP_FLAGS;
 typedef WORD PRINTEROP_FLAGS;