extra semicolons removed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 15f05003eabd7740ca722585d74d9db4e7a62b61..249395811a0852642131ab183a687f8d2b71da70 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -32,7 +32,7 @@
 #include "wx/tab.h"
 #include "wx/listimpl.cpp"
 
 #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)
 
 // 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 b9dcbf8c9a0f229652483a571164706db0b02c20..e47b8c2b1b1772a7425637bcc4a1d000bac20e1d 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -126,13 +126,13 @@ void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
     m_bmpSelectedOriginal = sel;
 
     DoSetBitmap();
     m_bmpSelectedOriginal = sel;
 
     DoSetBitmap();

-};
+}

 
 void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
 {
     m_bmpFocus = focus;
     // Not used in Motif
 
 void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
 {
     m_bmpFocus = focus;
     // Not used in Motif

-};
+}

 
 void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
 {
 
 void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
 {


@@ -140,7 +140,7 @@ void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
     m_bmpDisabledOriginal = disabled;
 
     DoSetBitmap();
     m_bmpDisabledOriginal = disabled;
 
     DoSetBitmap();

-};
+}

 
 void wxBitmapButton::DoSetBitmap()
 {
 
 void wxBitmapButton::DoSetBitmap()
 {

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 94cbda42b31b7b73a7f925e66c8daec00f1c6151..1353a842a924c251b42192aa36ae3f86169d43a7 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -168,8 +168,8 @@ struct wxDataIdToDataObject
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxDataObjectList);
-WX_DEFINE_LIST(wxDataIdToDataObjectList);
+WX_DEFINE_LIST(wxDataObjectList)
+WX_DEFINE_LIST(wxDataIdToDataObjectList)

 
 extern "C"
 {
 
 extern "C"
 {


@@ -231,8 +231,8 @@ bool wxClipboard::SetData( wxDataObject *data )
     return AddData( 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,
 
 #if wxCHECK_LESSTIF()
 void wxClipboardCallback( Widget xwidget, int* data_id,

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index a3af9a13dab5aa87e8de344081630c97adeade7f..deddb7a41c9f9edd67ba0a73ae56ffa3653ae51e 100644 (file)
--- 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_DECLARE_LIST(wxXCursor, wxXCursorList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxXCursorList);
+WX_DEFINE_LIST(wxXCursorList)

 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 19d75551f996e650e4725a3e61be498aeabd480a..2bf8dcbd71b9d4d6ec1dc3df261954a0218f6fe6 100644 (file)
--- 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));
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

-};
+}

 
 wxMemoryDC::wxMemoryDC( wxDC* dc )
 {
 
 wxMemoryDC::wxMemoryDC( wxDC* dc )
 {


@@ -80,11 +80,11 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
 
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
 
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);

-};
+}

 
 wxMemoryDC::~wxMemoryDC(void)
 {
 
 wxMemoryDC::~wxMemoryDC(void)
 {

-};
+}

 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {


@@ -120,7 +120,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         m_ok = false;
         m_pixmap = (WXPixmap) 0;
     };
         m_ok = false;
         m_pixmap = (WXPixmap) 0;
     };

-};
+}

 
 void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
 
 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;
     };
         if (width) (*width) = 0;
         if (height) (*height) = 0;
     };

-};
+}

 
 
 
 

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index f2edf7f43b860fd18a3f5d61b408ab723066ae76..205496ca057d002ec9f4bf2a2da4f7d859c227a8 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -410,7 +410,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
 };
 
     DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule);
+IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule)

 
 static void wxInputCallback( XtPointer, int* fd, XtInputId* )
 {
 
 static void wxInputCallback( XtPointer, int* fd, XtInputId* )
 {

diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index f3904bb57fc274fb6d392260a97c67383b5a752c..b0a0168c5167ef6f14cbd62bcfba5bc603a28538 100644 (file)
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/icon.h"
 
 
 #include "wx/icon.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)

 
 // ============================================================================
 // Icons
 
 // ============================================================================
 // Icons

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 823b5640ce05b211499ee8d6dc2102d09e9fe6bf..ae9a674ac427a85b565c774717a42b3c8fc2f2bf 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -32,7 +32,7 @@
 
 #include "wx/motif/private.h"
 
 
 #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,
 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index b6e108dee0925f03da75b014c77b97d635fdef42..edf7f20a5e1d9d15d2d5c66002ad17ea88d3ddd4 100644 (file)
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -26,7 +26,7 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler);
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)

 
 WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap);
 
 
 WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap);
 

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index a0838b3bb09c46c66600045e59d0d82ff3af2738..7f0a201f836fed5d7ec477c5a91d7f429268033f 100644 (file)
--- 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
     *x = xev.x_root;
     *y = xev.y_root;
 #endif

-};
+}

 
 // Return true if we have a colour display
 bool wxColourDisplay()
 
 // Return true if we have a colour display
 bool wxColourDisplay()

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 7d3d13616991e88724a273478ba3a54aec60ddb7..2c69e1b135cd1082a3d3d9a35b2c8826e9de4973 100644 (file)
--- 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
 // ============================================================================
 
 // Bitmap handlers
 // ============================================================================
 

-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase);
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)

 
 #define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
 
 
 #define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
 


@@ -1337,7 +1337,7 @@ public:
         { return false; }
 };
 
         { 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),
 
 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);
 };
 
                         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),
 
 bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
                               long WXUNUSED(flags),


@@ -1557,7 +1557,7 @@ public:
                         int width, int height, int depth = 1);
 };
 
                         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),
 
 bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
                                long WXUNUSED(flags),

diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index 14496f4b2cb12797888cf95f9808d5708d9e8cb9..518af38e74ea3a0af621a786e462916f2573fe98 100644 (file)
--- 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))
 
 #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
 
 // ----------------------------------------------------------------------------
 // wxRegion construction