From ed92c86785eb93ba6e8857b780fb7ea4effba8ef Mon Sep 17 00:00:00 2001
From: Lauri Nurmi <lanurmi@iki.fi>
Date: Tue, 9 Nov 2021 20:07:19 +0200
Subject: [PATCH] Use semicolon after wxIMPLEMENT_*_CLASS* in wx's own
 implementations

wxIMPLEMENT_DYNAMIC/ABSTRACT_CLASS* is documented to be used with a
semicolon, though it is not mandatory.

Not touching headers yet, to avoid -pedantic warnings in user code.

See https://github.com/wxWidgets/wxWidgets/pull/2584
---
 src/common/ipcbase.cpp      | 6 +++---
 src/common/menucmn.cpp      | 4 ++--
 src/common/module.cpp       | 2 +-
 src/common/odcombocmn.cpp   | 2 +-
 src/generic/progdlgg.cpp    | 2 +-
 src/generic/richmsgdlgg.cpp | 2 +-
 src/propgrid/props.cpp      | 4 ++--
 src/xrc/xh_aui.cpp          | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 4ad2874ed8..3b5498b09d 100644
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -17,9 +17,9 @@
 
 #include "wx/ipcbase.h"
 
-wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject)
-wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject)
-wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject);
 
 wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
     : m_buffer((char *)buffer),
diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index b6bcbb7a97..fb6a04b6d2 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -100,7 +100,7 @@ bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWrite
 
 #if wxUSE_MENUBAR
 wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \
-                                       wxMenuBarStreamingCallback)
+                                       wxMenuBarStreamingCallback);
 #endif
 
 #if wxUSE_EXTENDED_RTTI
@@ -187,7 +187,7 @@ wxENUM_MEMBER( wxITEM_RADIO )
 wxEND_ENUM( wxItemKind )
 
 wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject, "wx/menuitem.h", \
-                                       wxMenuItemStreamingCallback)
+                                       wxMenuItemStreamingCallback);
 
 wxBEGIN_PROPERTIES_TABLE(wxMenuItem)
 wxPROPERTY( Parent, wxMenu*, SetMenu, GetMenu, wxEMPTY_PARAMETER_VALUE, \
diff --git a/src/common/module.cpp b/src/common/module.cpp
index 7344cfbd96..7f949a2de0 100644
--- a/src/common/module.cpp
+++ b/src/common/module.cpp
@@ -22,7 +22,7 @@
 
 #define TRACE_MODULE wxT("module")
 
-wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject);
 
 wxModuleList wxModule::ms_modules;
 bool wxModule::ms_areInitialized = false;
diff --git a/src/common/odcombocmn.cpp b/src/common/odcombocmn.cpp
index eaee027ae2..d8da8598e5 100644
--- a/src/common/odcombocmn.cpp
+++ b/src/common/odcombocmn.cpp
@@ -38,7 +38,7 @@
 // ----------------------------------------------------------------------------
 
 wxIMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, \
-                               wxControlWithItems, "wx/odcombo.h")
+                               wxControlWithItems, "wx/odcombo.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox)
 wxEND_PROPERTIES_TABLE()
diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 9cb919c054..cf9f608a38 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -63,7 +63,7 @@ wxEND_EVENT_TABLE()
 // wxGenericProgressDialog implementation
 // ============================================================================
 
-wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog);
 
 // ----------------------------------------------------------------------------
 // wxGenericProgressDialog creation
diff --git a/src/generic/richmsgdlgg.cpp b/src/generic/richmsgdlgg.cpp
index 5feb08d337..df9c459ab5 100644
--- a/src/generic/richmsgdlgg.cpp
+++ b/src/generic/richmsgdlgg.cpp
@@ -24,7 +24,7 @@
 #include "wx/statline.h"
 #include "wx/artprov.h"
 
-wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog);
 
 // ----------------------------------------------------------------------------
 // Events and handlers
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 0d0fb2bdc0..01f4100936 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -191,7 +191,7 @@ bool wxNumericPropertyValidator::Validate(wxWindow* parent)
 // wxNumericProperty
 // -----------------------------------------------------------------------
 
-wxIMPLEMENT_ABSTRACT_CLASS(wxNumericProperty, wxPGProperty)
+wxIMPLEMENT_ABSTRACT_CLASS(wxNumericProperty, wxPGProperty);
 
 wxNumericProperty::wxNumericProperty(const wxString& label, const wxString& name)
     : wxPGProperty(label, name)
@@ -1958,7 +1958,7 @@ public:
 // wxDialogProperty
 // -----------------------------------------------------------------------
 
-wxIMPLEMENT_ABSTRACT_CLASS(wxEditorDialogProperty, wxPGProperty)
+wxIMPLEMENT_ABSTRACT_CLASS(wxEditorDialogProperty, wxPGProperty);
 
 wxEditorDialogProperty::wxEditorDialogProperty(const wxString& label, const wxString& name)
     : wxPGProperty(label, name)
diff --git a/src/xrc/xh_aui.cpp b/src/xrc/xh_aui.cpp
index 25de73735f..141375fefb 100644
--- a/src/xrc/xh_aui.cpp
+++ b/src/xrc/xh_aui.cpp
@@ -17,7 +17,7 @@
 #include "wx/aui/framemanager.h"
 #include "wx/aui/auibook.h"
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxAuiXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiXmlHandler, wxXmlResourceHandler);
 
 wxAuiXmlHandler::wxAuiXmlHandler()
                 : wxXmlResourceHandler(),