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

Use semicolon after wxIMPLEMENT_*_CLASS* in wx's own implementations

Browse Source 
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
This commit is contained in:
Lauri Nurmi
2021-11-09 20:07:19 +02:00
committed by Vadim Zeitlin
parent 5cea9f4649
commit ed92c86785
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/ipcbase.cpp
View File

@@ -17,9 +17,9 @@
#include "wx/ipcbase.h" #include "wx/ipcbase.h"
wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject) wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject);
wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject) wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject);
wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject) wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject);
wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes) wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
: m_buffer((char *)buffer), : m_buffer((char *)buffer),

4
src/common/menucmn.cpp
View File

@@ -100,7 +100,7 @@ bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWrite
#if wxUSE_MENUBAR #if wxUSE_MENUBAR
wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \ wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \
wxMenuBarStreamingCallback) wxMenuBarStreamingCallback);
#endif #endif
#if wxUSE_EXTENDED_RTTI #if wxUSE_EXTENDED_RTTI
@@ -187,7 +187,7 @@ wxENUM_MEMBER( wxITEM_RADIO )
wxEND_ENUM( wxItemKind ) wxEND_ENUM( wxItemKind )
wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject, "wx/menuitem.h", \ wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject, "wx/menuitem.h", \
wxMenuItemStreamingCallback) wxMenuItemStreamingCallback);
wxBEGIN_PROPERTIES_TABLE(wxMenuItem) wxBEGIN_PROPERTIES_TABLE(wxMenuItem)
wxPROPERTY( Parent, wxMenu*, SetMenu, GetMenu, wxEMPTY_PARAMETER_VALUE, \ wxPROPERTY( Parent, wxMenu*, SetMenu, GetMenu, wxEMPTY_PARAMETER_VALUE, \

2
src/common/module.cpp
View File

@@ -22,7 +22,7 @@
#define TRACE_MODULE wxT("module") #define TRACE_MODULE wxT("module")
wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject) wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject);
wxModuleList wxModule::ms_modules; wxModuleList wxModule::ms_modules;
bool wxModule::ms_areInitialized = false; bool wxModule::ms_areInitialized = false;

2
src/common/odcombocmn.cpp
View File

@@ -38,7 +38,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxIMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, \ wxIMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, \
wxControlWithItems, "wx/odcombo.h") wxControlWithItems, "wx/odcombo.h");
wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox) wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox)
wxEND_PROPERTIES_TABLE() wxEND_PROPERTIES_TABLE()

2
src/generic/progdlgg.cpp
View File

@@ -63,7 +63,7 @@ wxEND_EVENT_TABLE()
// wxGenericProgressDialog implementation // wxGenericProgressDialog implementation
// ============================================================================ // ============================================================================
wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog) wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxGenericProgressDialog creation // wxGenericProgressDialog creation

2
src/generic/richmsgdlgg.cpp
View File

@@ -24,7 +24,7 @@
#include "wx/statline.h" #include "wx/statline.h"
#include "wx/artprov.h" #include "wx/artprov.h"
wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog) wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Events and handlers // Events and handlers

4
src/propgrid/props.cpp
View File

@@ -191,7 +191,7 @@ bool wxNumericPropertyValidator::Validate(wxWindow* parent)
// wxNumericProperty // wxNumericProperty
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
wxIMPLEMENT_ABSTRACT_CLASS(wxNumericProperty, wxPGProperty) wxIMPLEMENT_ABSTRACT_CLASS(wxNumericProperty, wxPGProperty);
wxNumericProperty::wxNumericProperty(const wxString& label, const wxString& name) wxNumericProperty::wxNumericProperty(const wxString& label, const wxString& name)
: wxPGProperty(label, name) : wxPGProperty(label, name)
@@ -1958,7 +1958,7 @@ public:
// wxDialogProperty // wxDialogProperty
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
wxIMPLEMENT_ABSTRACT_CLASS(wxEditorDialogProperty, wxPGProperty) wxIMPLEMENT_ABSTRACT_CLASS(wxEditorDialogProperty, wxPGProperty);
wxEditorDialogProperty::wxEditorDialogProperty(const wxString& label, const wxString& name) wxEditorDialogProperty::wxEditorDialogProperty(const wxString& label, const wxString& name)
: wxPGProperty(label, name) : wxPGProperty(label, name)

2
src/xrc/xh_aui.cpp
View File

@@ -17,7 +17,7 @@
#include "wx/aui/framemanager.h" #include "wx/aui/framemanager.h"
#include "wx/aui/auibook.h" #include "wx/aui/auibook.h"
wxIMPLEMENT_DYNAMIC_CLASS(wxAuiXmlHandler, wxXmlResourceHandler) wxIMPLEMENT_DYNAMIC_CLASS(wxAuiXmlHandler, wxXmlResourceHandler);
wxAuiXmlHandler::wxAuiXmlHandler() wxAuiXmlHandler::wxAuiXmlHandler()
: wxXmlResourceHandler(), : wxXmlResourceHandler(),