From e933b5bc365e0907a4f0fd15b4c49e4c96c2b59f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 8 Oct 2005 17:10:10 +0000
Subject: [PATCH] extra semicolons removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/generic/tabg.cpp | 2 +-
src/motif/bmpbuttn.cpp | 6 +++---
src/motif/clipbrd.cpp | 8 ++++----
src/motif/cursor.cpp | 2 +-
src/motif/dcmemory.cpp | 10 +++++-----
src/motif/evtloop.cpp | 2 +-
src/motif/icon.cpp | 2 +-
src/motif/stattext.cpp | 2 +-
src/motif/timer.cpp | 2 +-
src/motif/utils.cpp | 2 +-
src/x11/bitmap.cpp | 8 ++++----
src/x11/region.cpp | 4 ++--
12 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 15f05003ea..249395811a 100644
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -32,7 +32,7 @@
#include "wx/tab.h"
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxTabLayerList);
+WX_DEFINE_LIST(wxTabLayerList)
// not defined: use old, square tab implementation (fills in tabs)
// defined: use new, rounded tab implementation (doesn't colour in tabs)
diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index b9dcbf8c9a..e47b8c2b1b 100644
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -126,13 +126,13 @@ void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
m_bmpSelectedOriginal = sel;
DoSetBitmap();
-};
+}
void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
{
m_bmpFocus = focus;
// Not used in Motif
-};
+}
void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
{
@@ -140,7 +140,7 @@ void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
m_bmpDisabledOriginal = disabled;
DoSetBitmap();
-};
+}
void wxBitmapButton::DoSetBitmap()
{
diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 94cbda42b3..1353a842a9 100644
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -168,8 +168,8 @@ struct wxDataIdToDataObject
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataObjectList);
-WX_DEFINE_LIST(wxDataIdToDataObjectList);
+WX_DEFINE_LIST(wxDataObjectList)
+WX_DEFINE_LIST(wxDataIdToDataObjectList)
extern "C"
{
@@ -231,8 +231,8 @@ bool wxClipboard::SetData( wxDataObject *data )
return AddData( data );
}
-wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
-wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
+wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray )
+wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray )
#if wxCHECK_LESSTIF()
void wxClipboardCallback( Widget xwidget, int* data_id,
diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index a3af9a13da..deddb7a41c 100644
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -43,7 +43,7 @@ public:
WX_DECLARE_LIST(wxXCursor, wxXCursorList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxXCursorList);
+WX_DEFINE_LIST(wxXCursorList)
class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
{
diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 19d75551f9..2bf8dcbd71 100644
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -54,7 +54,7 @@ wxMemoryDC::wxMemoryDC(void)
SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-};
+}
wxMemoryDC::wxMemoryDC( wxDC* dc )
{
@@ -80,11 +80,11 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN);
-};
+}
wxMemoryDC::~wxMemoryDC(void)
{
-};
+}
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
{
@@ -120,7 +120,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
m_ok = false;
m_pixmap = (WXPixmap) 0;
};
-};
+}
void wxMemoryDC::DoGetSize( int *width, int *height ) const
{
@@ -134,6 +134,6 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
if (width) (*width) = 0;
if (height) (*height) = 0;
};
-};
+}
diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index f2edf7f43b..205496ca05 100644
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -410,7 +410,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
};
-IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule);
+IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule)
static void wxInputCallback( XtPointer, int* fd, XtInputId* )
{
diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index f3904bb57f..b0a0168c51 100644
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -14,7 +14,7 @@
#include "wx/icon.h"
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
// ============================================================================
// Icons
diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 823b5640ce..ae9a674ac4 100644
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -32,7 +32,7 @@
#include "wx/motif/private.h"
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl);
+IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
const wxString& label,
diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index b6e108dee0..edf7f20a5e 100644
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -26,7 +26,7 @@
#include "wx/motif/private.h"
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler);
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap);
diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index a0838b3bb0..7f0a201f83 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -529,7 +529,7 @@ void wxGetMousePosition( int* x, int* y )
*x = xev.x_root;
*y = xev.y_root;
#endif
-};
+}
// Return true if we have a colour display
bool wxColourDisplay()
diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 7d3d136169..2c69e1b135 100644
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -1303,7 +1303,7 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe
// Bitmap handlers
// ============================================================================
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase);
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
@@ -1337,7 +1337,7 @@ public:
{ return false; }
};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
long WXUNUSED(flags), int WXUNUSED(desiredWidth),
@@ -1451,7 +1451,7 @@ public:
int width, int height, int depth = 1);
};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
long WXUNUSED(flags),
@@ -1557,7 +1557,7 @@ public:
int width, int height, int depth = 1);
};
-IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
long WXUNUSED(flags),
diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index 14496f4b2c..518af38e74 100644
--- a/src/x11/region.cpp
+++ b/src/x11/region.cpp
@@ -58,8 +58,8 @@ public:
#define M_REGIONDATA ((wxRegionRefData *)m_refData)
#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
// ----------------------------------------------------------------------------
// wxRegion construction
--
2.47.2