aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2004-11-04 07:09:52 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2004-11-04 07:09:52 +0000
commitc3ea0cd332ce0800364ad81d388f61ecf7210234 (patch)
tree1595f056268691059337b047db6a75de0251b49c
parent9dee1466e82480dc1224da64cb654f4b0a286ca8 (diff)
downloadnewlib-c3ea0cd332ce0800364ad81d388f61ecf7210234.zip
newlib-c3ea0cd332ce0800364ad81d388f61ecf7210234.tar.gz
newlib-c3ea0cd332ce0800364ad81d388f61ecf7210234.tar.bz2
* include/wingdi.h (NIF_INFO): Add define.
(NIIF_*) Add defines.. Thanks to: Benoit Blanchon <benoit.blanchon@free.fr> (NIF_*): Convert constants to hex.
-rw-r--r--winsup/w32api/ChangeLog7
-rw-r--r--winsup/w32api/include/shellapi.h19
2 files changed, 22 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index e9e5f48..a6ab54e 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-04 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/wingdi.h (NIF_INFO): Add define.
+ (NIIF_*) Add defines..
+ Thanks to: Benoit Blanchon <benoit.blanchon@free.fr>
+ (NIF_*): Convert constants to hex.
+
2004-11-02 Danny Smith <dannysmith@users.sourceforge.net>
* include/wingdi.h (GetFontUnicodeRanges,GetGlyphIndicesA,
diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index 8dbd7b1..8b323d3 100644
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -51,10 +51,21 @@ extern "C" {
#define NIM_SETFOCUS 3
#define NIM_SETVERSION 4
#endif
-#define NIF_MESSAGE 1
-#define NIF_ICON 2
-#define NIF_TIP 4
-#define NIF_STATE 8
+#define NIF_MESSAGE 0x00000001
+#define NIF_ICON 0x00000002
+#define NIF_TIP 0x00000004
+#define NIF_STATE 0x00000008
+#if (_WIN32_IE >= 0x0500)
+#define NIF_INFO 0x00000010
+#define NIIF_NONE 0x00000000
+#define NIIF_INFO 0x00000001
+#define NIIF_WARNING 0x00000002
+#define NIIF_ERROR 0x00000003
+#endif
+#if (_WIN32_IE >= 0x0600)
+#define NIIF_ICON_MASK 0x0000000F
+#define NIIF_NOSOUND 0x00000010
+#endif
#define NIS_HIDDEN 1
#define NIS_SHAREDICON 2
#define SE_ERR_FNF 2