From 824f7e63f22185f210f23bb655553bec9ce4485d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Oct 2022 18:58:47 +0200 Subject: [PATCH] Stop using obsolete wxW64 macro Still define it for compatibility, but at least don't use it in our own code. --- include/wx/defs.h | 6 +++--- include/wx/types.h | 14 +++----------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 6cc9f7376a..8060b89808 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2947,9 +2947,9 @@ typedef wxUint64 WXWPARAM; typedef wxInt64 WXLPARAM; typedef wxInt64 WXLRESULT; #else -typedef wxW64 unsigned int WXWPARAM; -typedef wxW64 long WXLPARAM; -typedef wxW64 long WXLRESULT; +typedef unsigned int WXWPARAM; +typedef long WXLPARAM; +typedef long WXLRESULT; #endif /* diff --git a/include/wx/types.h b/include/wx/types.h index 8ac189b109..2105dfe8fe 100644 --- a/include/wx/types.h +++ b/include/wx/types.h @@ -341,17 +341,9 @@ typedef wxUint32 wxDword; #endif /* - We can't rely on Windows _W64 being defined as windows.h may not be - included so define our own equivalent: this should be used with types - like WXLPARAM or WXWPARAM which are 64 bit under Win64 to avoid warnings - each time we cast it to a pointer or a handle (which results in hundreds - of warnings as Win32 API often passes pointers in them) + This macro is obsolete and defined only for compatibility, don't use. */ -#if defined(__VISUALC__) && (_MSC_VER < 1800) - #define wxW64 __w64 -#else - #define wxW64 -#endif +#define wxW64 /* Define signed and unsigned integral types big enough to contain all of long, @@ -371,7 +363,7 @@ typedef wxUint32 wxDword; to wxIntPtr (which we do often as this is what it is defined for) in 32 bit build with MSVC. */ - typedef wxW64 ssize_t wxIntPtr; + typedef ssize_t wxIntPtr; typedef size_t wxUIntPtr; #else /*