From 412e0d47c05d69cb029e9dbd11b31ce24fb2377e Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Sun, 20 Nov 2005 21:55:35 +0000
Subject: [PATCH] applied patch #1356901 "Yet another removal of extra
semicolons", also fixed remaining similar cases of extra semicolons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
contrib/samples/applet/monitorapplet.cpp | 2 +-
contrib/src/applet/appletwindow.cpp | 6 +--
contrib/src/applet/loadpage.cpp | 4 +-
contrib/src/plot/plot.cpp | 42 +++++++++----------
samples/opengl/penguin/dxfrenderer.cpp | 4 +-
src/common/list.cpp | 2 +-
src/common/mediactrlcmn.cpp | 14 +++----
src/common/wincmn.cpp | 2 +-
src/generic/filedlgg.cpp | 2 +-
src/generic/regiong.cpp | 4 +-
src/mac/carbon/accel.cpp | 2 +-
src/mac/carbon/mediactrl.cpp | 4 +-
src/mac/classic/accel.cpp | 2 +-
src/mgl/fontutil.cpp | 4 +-
src/msw/mediactrl.cpp | 8 ++--
src/os2/gdiimage.cpp | 2 +-
src/palmos/gdiimage.cpp | 2 +-
src/palmos/menu.cpp | 2 +-
src/palmos/notebook.cpp | 2 +-
src/richtext/richtextbuffer.cpp | 4 +-
src/univ/toolbar.cpp | 2 +-
src/unix/mediactrl.cpp | 4 +-
tests/hashes/hashes.cpp | 2 +-
tests/lists/lists.cpp | 4 +-
.../gizmos/wxCode/src/treelistctrl.cpp | 4 +-
wxPython/contrib/iewin/IEHtmlWin.cpp | 16 +++----
26 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/contrib/samples/applet/monitorapplet.cpp b/contrib/samples/applet/monitorapplet.cpp
index 6fcd1fb041..12964d3f17 100644
--- a/contrib/samples/applet/monitorapplet.cpp
+++ b/contrib/samples/applet/monitorapplet.cpp
@@ -36,7 +36,7 @@
/*---------------------------- Global variables ---------------------------*/
// Implement the dynamic class so it can be constructed dynamically
-IMPLEMENT_DYNAMIC_CLASS(MonitorApplet, wxApplet);
+IMPLEMENT_DYNAMIC_CLASS(MonitorApplet, wxApplet)
// Event handler table.
BEGIN_EVENT_TABLE(MonitorApplet, wxApplet)
diff --git a/contrib/src/applet/appletwindow.cpp b/contrib/src/applet/appletwindow.cpp
index 9329a0bb20..07c52493f8 100644
--- a/contrib/src/applet/appletwindow.cpp
+++ b/contrib/src/applet/appletwindow.cpp
@@ -68,14 +68,14 @@ BEGIN_EVENT_TABLE(wxHtmlAppletWindow, wxHtmlWindow)
END_EVENT_TABLE()
// Implement the class functions for wxHtmlAppletWindow
-IMPLEMENT_CLASS(wxHtmlAppletWindow, wxHtmlWindow);
+IMPLEMENT_CLASS(wxHtmlAppletWindow, wxHtmlWindow)
// Implement the dynamic class so it can be constructed dynamically
-IMPLEMENT_DYNAMIC_CLASS(VirtualData, wxObject);
+IMPLEMENT_DYNAMIC_CLASS(VirtualData, wxObject)
// Define the wxAppletList implementation
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAppletList);
+WX_DEFINE_LIST(wxAppletList)
/****************************************************************************
REMARKS:
diff --git a/contrib/src/applet/loadpage.cpp b/contrib/src/applet/loadpage.cpp
index 705a2e4a61..c743228e8c 100644
--- a/contrib/src/applet/loadpage.cpp
+++ b/contrib/src/applet/loadpage.cpp
@@ -41,10 +41,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxLoadPageEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxPageLoadedEvent, wxEvent)
// Define our custom event ID for load page
-DEFINE_EVENT_TYPE(wxEVT_LOAD_PAGE);
+DEFINE_EVENT_TYPE(wxEVT_LOAD_PAGE)
// Define our custom event ID for page loaded
-DEFINE_EVENT_TYPE(wxEVT_PAGE_LOADED);
+DEFINE_EVENT_TYPE(wxEVT_PAGE_LOADED)
/****************************************************************************
REMARKS:
diff --git a/contrib/src/plot/plot.cpp b/contrib/src/plot/plot.cpp
index a6472e5358..3e10d49c4d 100644
--- a/contrib/src/plot/plot.cpp
+++ b/contrib/src/plot/plot.cpp
@@ -51,27 +51,27 @@
// event types
//----------------------------------------------------------------------------
-DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGING);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGED);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_CLICKED);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_DOUBLECLICKED);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_IN);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_OUT);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATING);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATED);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGING);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGED);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATING);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATED);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGING);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGED);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_X_LABEL_EDIT);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_END_X_LABEL_EDIT);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_END_Y_LABEL_EDIT);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_TITLE_EDIT);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_END_TITLE_EDIT);
-DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_CREATE);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGING)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_IN)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_OUT)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATING)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATED)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGING)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATING)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATED)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGING)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_X_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_END_X_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_END_Y_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_TITLE_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_END_TITLE_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_CREATE)
//----------------------------------------------------------------------------
// accessor functions for the bitmaps (may return NULL, check for it!)
diff --git a/samples/opengl/penguin/dxfrenderer.cpp b/samples/opengl/penguin/dxfrenderer.cpp
index 5d18667872..35481f884d 100644
--- a/samples/opengl/penguin/dxfrenderer.cpp
+++ b/samples/opengl/penguin/dxfrenderer.cpp
@@ -40,8 +40,8 @@
#include "dxfrenderer.h"
#include <wx/listimpl.cpp>
-WX_DEFINE_LIST(DXFEntityList);
-WX_DEFINE_LIST(DXFLayerList);
+WX_DEFINE_LIST(DXFEntityList)
+WX_DEFINE_LIST(DXFLayerList)
// Conversion table from AutoCAD ACI colours to RGB values
static const struct { unsigned char r, g, b; } aci_to_rgb[256] = {
diff --git a/src/common/list.cpp b/src/common/list.cpp
index 398627b6c0..d400eff517 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -755,7 +755,7 @@ wxNode *wxStringList::Prepend(const wxChar *s)
#else // wxUSE_STL = 1
#include "wx/listimpl.cpp"
- WX_DEFINE_LIST(wxObjectList);
+ WX_DEFINE_LIST(wxObjectList)
// with wxUSE_STL wxStringList contains wxString objects, not pointers
void wxStringListBase::DeleteFunction( const wxString WXUNUSED(X) )
diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index 1762093574..618eccabf9 100644
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -44,12 +44,12 @@
// RTTI and Event implementations
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-IMPLEMENT_CLASS(wxMediaCtrl, wxControl);
-IMPLEMENT_CLASS(wxMediaBackend, wxObject);
-IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent);
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED);
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_LOADED);
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP);
+IMPLEMENT_CLASS(wxMediaCtrl, wxControl)
+IMPLEMENT_CLASS(wxMediaBackend, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent)
+DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED)
+DEFINE_EVENT_TYPE(wxEVT_MEDIA_LOADED)
+DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP)
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
//
@@ -508,7 +508,7 @@ void wxMediaBackendCommonBase::QueueEvent(wxEventType evtType)
}
#include "wx/html/forcelnk.h"
-FORCE_LINK(basewxmediabackends);
+FORCE_LINK(basewxmediabackends)
//---------------------------------------------------------------------------
// End of compilation guard and of file
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 8c1c94ec41..763d5206d6 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -2365,7 +2365,7 @@ wxAccessible* wxWindowBase::CreateAccessible()
#if wxUSE_STL
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxWindowList);
+WX_DEFINE_LIST(wxWindowList)
#else
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5f673a532f..fc92b7327a 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1486,7 +1486,7 @@ void wxGenericFileDialog::UpdateControls()
#ifdef USE_GENERIC_FILEDIALOG
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
#endif // USE_GENERIC_FILEDIALOG
diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp
index 92cbe6ad95..0867643f0c 100644
--- a/src/generic/regiong.cpp
+++ b/src/generic/regiong.cpp
@@ -228,7 +228,7 @@ private:
// ========================================================================
// wxRegionGeneric
// ========================================================================
-//IMPLEMENT_DYNAMIC_CLASS(wxRegionGeneric, wxGDIObject);
+//IMPLEMENT_DYNAMIC_CLASS(wxRegionGeneric, wxGDIObject)
#define M_REGIONDATA ((wxRegionRefData *)m_refData)
#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
@@ -415,7 +415,7 @@ wxRegionContain wxRegionGeneric::Contains(const wxRect& rect) const
// ========================================================================
// wxRegionIteratorGeneric
// ========================================================================
-//IMPLEMENT_DYNAMIC_CLASS(wxRegionIteratorGeneric,wxObject);
+//IMPLEMENT_DYNAMIC_CLASS(wxRegionIteratorGeneric,wxObject)
wxRegionIteratorGeneric::wxRegionIteratorGeneric()
{
diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index fbda435df5..1ca16d6c29 100644
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -22,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAccelList);
+WX_DEFINE_LIST(wxAccelList)
// ----------------------------------------------------------------------------
// wxAccelRefData: the data used by wxAcceleratorTable
diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index 1a22a896dc..a9267f74b6 100644
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -201,7 +201,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxQTMediaWindowEventHandler );
//
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
+IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
//Time between timer calls - this is the Apple recommondation to the TCL
//team I believe
@@ -1160,6 +1160,6 @@ OSStatus wxQTMediaWindowEventHandler(EventHandlerCallRef inHandlerCallRef,
//in source file that contains stuff you don't directly use
#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(basewxmediabackends);
+FORCE_LINK_ME(basewxmediabackends)
#endif //wxUSE_MEDIACTRL
diff --git a/src/mac/classic/accel.cpp b/src/mac/classic/accel.cpp
index af326fa2b8..4e5bbd85f5 100644
--- a/src/mac/classic/accel.cpp
+++ b/src/mac/classic/accel.cpp
@@ -21,7 +21,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
WX_DECLARE_LIST(wxAcceleratorEntry, wxAccelList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAccelList);
+WX_DEFINE_LIST(wxAccelList)
// ----------------------------------------------------------------------------
// wxAccelRefData: the data used by wxAcceleratorTable
diff --git a/src/mgl/fontutil.cpp b/src/mgl/fontutil.cpp
index 2ebffd3e47..eeb232e87a 100644
--- a/src/mgl/fontutil.cpp
+++ b/src/mgl/fontutil.cpp
@@ -153,8 +153,8 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
// ----------------------------------------------------------------------------
WX_DECLARE_LIST(wxMGLFontInstance, wxMGLFontInstanceList);
-WX_DEFINE_LIST(wxMGLFontInstanceList);
-WX_DEFINE_LIST(wxMGLFontFamilyList);
+WX_DEFINE_LIST(wxMGLFontInstanceList)
+WX_DEFINE_LIST(wxMGLFontFamilyList)
wxMGLFontInstance::wxMGLFontInstance(wxMGLFontLibrary *fontLib,
float pt, bool slant, bool aa)
diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index 3e05af9874..7c2e511cfd 100644
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -1376,7 +1376,7 @@ private:
//
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend);
+IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend)
//---------------------------------------------------------------------------
// Usual debugging macros
@@ -2180,7 +2180,7 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y),
//
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-IMPLEMENT_DYNAMIC_CLASS(wxMCIMediaBackend, wxMediaBackend);
+IMPLEMENT_DYNAMIC_CLASS(wxMCIMediaBackend, wxMediaBackend)
//---------------------------------------------------------------------------
// Usual debugging macros for MCI returns
@@ -2708,7 +2708,7 @@ LRESULT CALLBACK wxMCIMediaBackend::OnNotifyWndProc(HWND hWnd, UINT nMsg,
// with this backend are treated as playable anyway - not verifyed though.
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
+IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
//Time between timer calls - this is the Apple recommondation to the TCL
//team I believe
@@ -3537,7 +3537,7 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
//in source file that contains stuff you don't directly use
#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(basewxmediabackends);
+FORCE_LINK_ME(basewxmediabackends)
//---------------------------------------------------------------------------
// End wxMediaCtrl Compilation Guard and this file
diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index b4dc31cd00..69d6210bf8 100644
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -30,7 +30,7 @@
#include "wx/os2/gdiimage.h"
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxGDIImageHandlerList);
+WX_DEFINE_LIST(wxGDIImageHandlerList)
// ----------------------------------------------------------------------------
// private classes
diff --git a/src/palmos/gdiimage.cpp b/src/palmos/gdiimage.cpp
index ac1b03e9b9..b4af31c463 100644
--- a/src/palmos/gdiimage.cpp
+++ b/src/palmos/gdiimage.cpp
@@ -41,7 +41,7 @@
#include "wx/file.h"
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxGDIImageHandlerList);
+WX_DEFINE_LIST(wxGDIImageHandlerList)
// ----------------------------------------------------------------------------
// auxiliary functions
diff --git a/src/palmos/menu.cpp b/src/palmos/menu.cpp
index 428106a834..eba71c427b 100644
--- a/src/palmos/menu.cpp
+++ b/src/palmos/menu.cpp
@@ -65,7 +65,7 @@ static const int idMenuTitle = -3;
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST( wxMenuInfoList ) ;
+WX_DEFINE_LIST( wxMenuInfoList )
#if wxUSE_EXTENDED_RTTI
diff --git a/src/palmos/notebook.cpp b/src/palmos/notebook.cpp
index 71aca55caa..0fb00011a3 100644
--- a/src/palmos/notebook.cpp
+++ b/src/palmos/notebook.cpp
@@ -36,7 +36,7 @@
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST( wxNotebookPageInfoList ) ;
+WX_DEFINE_LIST( wxNotebookPageInfoList )
DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 2d896e02c6..3e4e08a5bf 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -37,8 +37,8 @@
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxRichTextObjectList);
-WX_DEFINE_LIST(wxRichTextLineList);
+WX_DEFINE_LIST(wxRichTextObjectList)
+WX_DEFINE_LIST(wxRichTextLineList)
/*!
* wxRichTextObject
diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index d07923834e..bb134fe21f 100644
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -128,7 +128,7 @@ private:
// wxToolBar implementation
// ============================================================================
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
// ----------------------------------------------------------------------------
// wxToolBar creation
diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index 220d37dfa3..33d06eaca2 100644
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -139,7 +139,7 @@ public:
//
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-IMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend);
+IMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend)
//---------------------------------------------------------------------------
// wxGStreamerMediaBackend Constructor
@@ -762,6 +762,6 @@ bool wxGStreamerMediaBackend::SetPlaybackRate(double dRate)
//in source file that contains stuff you don't directly use
#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(basewxmediabackends);
+FORCE_LINK_ME(basewxmediabackends)
#endif //wxUSE_MEDIACTRL
diff --git a/tests/hashes/hashes.cpp b/tests/hashes/hashes.cpp
index 229703f9c5..a277728591 100644
--- a/tests/hashes/hashes.cpp
+++ b/tests/hashes/hashes.cpp
@@ -272,7 +272,7 @@ WX_DECLARE_HASH(Foo, wxListFoos, wxHashFoos);
#if WXWIN_COMPATIBILITY_2_4
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListFoos);
+WX_DEFINE_LIST(wxListFoos)
#endif
void HashesTestCase::wxTypedHashTableTest()
diff --git a/tests/lists/lists.cpp b/tests/lists/lists.cpp
index 1cdd916a4e..16ea8a3d37 100644
--- a/tests/lists/lists.cpp
+++ b/tests/lists/lists.cpp
@@ -75,10 +75,10 @@ size_t Baz::ms_bars = 0;
WX_DECLARE_LIST(Baz, wxListBazs);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListBazs);
+WX_DEFINE_LIST(wxListBazs)
WX_DECLARE_LIST(int, wxListInt);
-WX_DEFINE_LIST(wxListInt);
+WX_DEFINE_LIST(wxListInt)
void ListsTestCase::wxListTest()
{
diff --git a/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp b/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
index 1194a14750..eebd9d3a81 100644
--- a/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
+++ b/wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
@@ -1070,7 +1070,7 @@ void wxTreeListTextCtrl::OnKillFocus( wxFocusEvent &event )
// wxTreeListHeaderWindow
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxTreeListHeaderWindow,wxWindow);
+IMPLEMENT_DYNAMIC_CLASS(wxTreeListHeaderWindow,wxWindow)
BEGIN_EVENT_TABLE(wxTreeListHeaderWindow,wxWindow)
EVT_ERASE_BACKGROUND (wxTreeListHeaderWindow::OnEraseBackground)
@@ -4625,7 +4625,7 @@ void wxTreeListMainWindow::SetFocus()
// wxTreeListCtrl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxTreeListCtrl, wxControl);
+IMPLEMENT_DYNAMIC_CLASS(wxTreeListCtrl, wxControl)
BEGIN_EVENT_TABLE(wxTreeListCtrl, wxControl)
EVT_SIZE(wxTreeListCtrl::OnSize)
diff --git a/wxPython/contrib/iewin/IEHtmlWin.cpp b/wxPython/contrib/iewin/IEHtmlWin.cpp
index ad35820d51..b098197b76 100644
--- a/wxPython/contrib/iewin/IEHtmlWin.cpp
+++ b/wxPython/contrib/iewin/IEHtmlWin.cpp
@@ -13,14 +13,14 @@
#include <sstream>
using namespace std;
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2);
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_NEWWINDOW2);
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE);
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_PROGRESSCHANGE);
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE);
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_TITLECHANGE);
-
-IMPLEMENT_DYNAMIC_CLASS(wxMSHTMLEvent, wxNotifyEvent);
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_NEWWINDOW2)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_PROGRESSCHANGE)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MSHTML_TITLECHANGE)
+
+IMPLEMENT_DYNAMIC_CLASS(wxMSHTMLEvent, wxNotifyEvent)
//////////////////////////////////////////////////////////////////////
--
2.47.2