solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Stop using obsolete wxW64 macro

Browse source 
Still define it for compatibility, but at least don't use it in our own
code.
This commit is contained in:
Vadim Zeitlin 2022-10-09 18:58:47 +02:00
parent e1d63e5629
commit 824f7e63f2
2 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/wx/defs.h
View file

@ -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
/*

14
include/wx/types.h
View file

@ -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
/*