From 3db0008552ca9b9b1fbb09b9d7d913e661b99f3e Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 6 Dec 2002 23:19:54 +0000 Subject: [PATCH] Define PSH_WIZARD97 (problem reported by jaymz@free.fr). --- dlls/comctl32/propsheet.c | 2 -- include/prsht.h | 17 +++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a42f4961f4f..df9ab0d0922 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -112,8 +112,6 @@ const WCHAR PropSheetInfoStr[] = #define MAX_TABTEXT_LENGTH 255 #define MAX_BUTTONTEXT_LENGTH 64 -#define PSH_WIZARD97_OLD 0x00002000 -#define PSH_WIZARD97_NEW 0x01000000 #define INTRNL_ANY_WIZARD (PSH_WIZARD | PSH_WIZARD97_OLD | PSH_WIZARD97_NEW | PSH_WIZARD_LITE) /****************************************************************************** diff --git a/include/prsht.h b/include/prsht.h index 790c113c043..24f6fb7491e 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -253,10 +253,7 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) #define PSH_RTLREADING 0x0800 #define PSH_WIZARDCONTEXTHELP 0x00001000 - /* - * for below IE 5 - * PSH_WIZARD97 0x00002000 - */ +#define PSH_WIZARD97_OLD 0x00002000 /* for IE < 5 */ #define PSH_WATERMARK 0x00008000 #define PSH_USEHBMWATERMARK 0x00010000 #define PSH_USEHPLWATERMARK 0x00020000 @@ -265,11 +262,15 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) #define PSH_USEHBMHEADER 0x00100000 #define PSH_USEPAGELANG 0x00200000 #define PSH_WIZARD_LITE 0x00400000 - /* - * for IE 5 and above - * PSH_WIZARD97 0x01000000 - */ +#define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */ #define PSH_NOCONTEXTHELP 0x02000000 +#ifndef __WINE__ +# if _WIN32_IE < 0x0500 +# define PSH_WIZARD97 PSH_WIZARD97_OLD +# else +# define PSH_WIZARD97 PSH_WIZARD97_NEW +# endif +#endif #define PSCB_INITIALIZED 1 #define PSCB_PRECREATE 2