From c3ea0cd332ce0800364ad81d388f61ecf7210234 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 4 Nov 2004 07:09:52 +0000 Subject: [PATCH] * include/wingdi.h (NIF_INFO): Add define. (NIIF_*) Add defines.. Thanks to: Benoit Blanchon (NIF_*): Convert constants to hex. --- winsup/w32api/ChangeLog | 7 +++++++ winsup/w32api/include/shellapi.h | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index e9e5f4831..a6ab54ed8 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2004-11-04 Danny Smith + + * include/wingdi.h (NIF_INFO): Add define. + (NIIF_*) Add defines.. + Thanks to: Benoit Blanchon + (NIF_*): Convert constants to hex. + 2004-11-02 Danny Smith * include/wingdi.h (GetFontUnicodeRanges,GetGlyphIndicesA, diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h index 8dbd7b1bb..8b323d37a 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