Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -Wpedantic in wxDECLARE_ABSTRACT_CLASS()

Browse Source 
Fix a regression introduced in c924ecb10a (Suppress -Wsuggest-override
warnings in user code for gcc too, 2020-07-27) and rearrange the macro
to make sure a semicolon is necessary after it.

Closes #18901.
This commit is contained in:
Vadim Zeitlin
2020-08-25 17:36:02 +02:00
parent 30fc873626
commit 054d98b1df
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/rtti.h
View File

@@ -139,10 +139,10 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
#define wxDECLARE_ABSTRACT_CLASS(name) \ #define wxDECLARE_ABSTRACT_CLASS(name) \
public: \ public: \
static wxClassInfo ms_classInfo; \
wxWARNING_SUPPRESS_MISSING_OVERRIDE() \ wxWARNING_SUPPRESS_MISSING_OVERRIDE() \
virtual wxClassInfo *GetClassInfo() const; \ virtual wxClassInfo *GetClassInfo() const; \
wxWARNING_RESTORE_MISSING_OVERRIDE() wxWARNING_RESTORE_MISSING_OVERRIDE() \
static wxClassInfo ms_classInfo
#define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \ #define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \
wxDECLARE_NO_ASSIGN_CLASS(name); \ wxDECLARE_NO_ASSIGN_CLASS(name); \