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

Don't give warnings when implementing deprecated classes

Browse source 
Check for WXBUILDING when defining wxDEPRECATED_EXPORT_CORE() and don't
actually include the "deprecated" part in this macro when building wx
itself to avoid warnings during the build (which are suppressed when
building wxGTK3 but not the other ports).

This should have been part of 2d939a3665 (Add wxDEPRECATED_EXPORT_CORE()
macro for wxTransformMatrix, 2022-09-18), see #22790.

This commit is best viewed ignoring whitespace-only changes.

See #22820.
This commit is contained in:
Vadim Zeitlin 2022-09-23 01:49:14 +02:00
parent 359138321e
commit c8af0a3b71
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/wx/defs.h
View file

@ -705,25 +705,32 @@ typedef short int WXTYPE;
#ifdef __cplusplus
/*
Special macro used for the classes that are exported and deprecated.
wxDEPRECATED_EXPORT_CORE is a special macro used for the classes that are
exported and deprecated (but not when building the library itself, as this
would trigger warnings about using this class when implementing it).
It exists because standard [[deprecated]] attribute can't be combined with
legacy __attribute__((visibility)), but we can't use [[visibility]] instead
of the latter because it can't be use in the same place in the declarations
where we use WXDLLIMPEXP_CORE. So we define this special macro which uses
the standard visibility attribute just where we can't do otherwise.
*/
#ifdef wxHAS_DEPRECATED_ATTR
#if __has_cpp_attribute(gnu::visibility)
#define wxDEPRECATED_EXPORT_CORE(msg) \
[[deprecated(msg), gnu::visibility("default")]]
#ifdef WXBUILDING
#define wxDEPRECATED_EXPORT_CORE(msg) WXDLLIMPEXP_CORE
#else /* !WXBUILDING */
#ifdef wxHAS_DEPRECATED_ATTR
#if __has_cpp_attribute(gnu::visibility)
#define wxDEPRECATED_EXPORT_CORE(msg) \
[[deprecated(msg), gnu::visibility("default")]]
#endif
#endif
#endif
#ifndef wxDEPRECATED_EXPORT_CORE
/* Fall back when nothing special is needed or available. */
#define wxDEPRECATED_EXPORT_CORE(msg) \
wxDEPRECATED_MSG(msg) WXDLLIMPEXP_CORE
#endif
#ifndef wxDEPRECATED_EXPORT_CORE
/* Fall back when nothing special is needed or available. */
#define wxDEPRECATED_EXPORT_CORE(msg) \
wxDEPRECATED_MSG(msg) WXDLLIMPEXP_CORE
#endif
#endif /* WXBUILDING/!WXBUILDING */
#endif /* __cplusplus */