From 054d98b1df927e3a3a59bd5c00f4d571e678ced1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 25 Aug 2020 17:36:02 +0200 Subject: [PATCH] Fix -Wpedantic in wxDECLARE_ABSTRACT_CLASS() 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. --- include/wx/rtti.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/rtti.h b/include/wx/rtti.h index 15e270d539..09faa06d51 100644 --- a/include/wx/rtti.h +++ b/include/wx/rtti.h @@ -139,10 +139,10 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name); #define wxDECLARE_ABSTRACT_CLASS(name) \ public: \ - static wxClassInfo ms_classInfo; \ wxWARNING_SUPPRESS_MISSING_OVERRIDE() \ virtual wxClassInfo *GetClassInfo() const; \ - wxWARNING_RESTORE_MISSING_OVERRIDE() + wxWARNING_RESTORE_MISSING_OVERRIDE() \ + static wxClassInfo ms_classInfo #define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name) \ wxDECLARE_NO_ASSIGN_CLASS(name); \