more extra semicolons removed (patch 1303724)

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

diff --git a/include/wx/build.h b/include/wx/build.h
index 4cc0dca46d2146039866810b56eb6bcb22b70030..b64fb8f5d67f66064010afa77912d238f26aa9ca 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -117,7 +117,7 @@
         wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE,     \
                                         libName);                       \
         return true;                                                    \
-    };                                                                  \
+    }                                                                   \
     static bool gs_buildOptionsCheck = wxCheckBuildOptions();
 
 

diff --git a/include/wx/ptr_scpd.h b/include/wx/ptr_scpd.h
index 9f7c88de4bb8002da80d20c354b92abe2177d79f..8ab3f3797152ea2ae2f47cd40f6fa20bfada4f2a 100644 (file)
--- a/include/wx/ptr_scpd.h
+++ b/include/wx/ptr_scpd.h
@@ -197,7 +197,7 @@ void name::reset(T * p){                \
 // ----------------------------------------------------------------------------
 
 #define wxDEFINE_TIED_SCOPED_PTR_TYPE(T)                                      \
-    wxDEFINE_SCOPED_PTR_TYPE(T);                                              \
+    wxDEFINE_SCOPED_PTR_TYPE(T)                                               \
     class T ## TiedPtr : public T ## Ptr                                      \
     {                                                                         \
     public:                                                                   \
@@ -216,7 +216,7 @@ void name::reset(T * p){                \
     private:                                                                  \
         T **m_pp;                                                             \
         T *m_pOld;                                                            \
-    }
+    };
 
 #endif // __WX_SCOPED_POINTER__
 

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 3a20b9ed16119eb5aa68b2db1f320be10537727b..f4ec68fde9a9d7c353d7b6ae012b52d2f8916119 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -61,7 +61,7 @@ WX_CHECK_BUILD_OPTIONS("wxCore")
 // ----------------------------------------------------------------------------
 
 // this defines wxEventLoopPtr
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop);
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
 
 // ============================================================================
 // wxAppBase implementation

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 16f593e9c8071f1973fb55151eaecc380d5fd4f6..d7497a45ff31274818684c1bc9e0073770f1c2a2 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -38,7 +38,7 @@
 
 #include "wx/listimpl.cpp"
 WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList);
-WX_DEFINE_LIST(wxArtProvidersList);
+WX_DEFINE_LIST(wxArtProvidersList)
 
 // ----------------------------------------------------------------------------
 // Cache class - stores already requested bitmaps

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 97b89544edf8a8d020b867f0ef3e93030e8b0973..99e3947c72072bb8e4ca7467859d24f179de616b 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -38,7 +38,7 @@
 
 #include "wx/listimpl.cpp"
 
-WX_DEFINE_LIST(wxSimpleDataObjectList);
+WX_DEFINE_LIST(wxSimpleDataObjectList)
 
 // ----------------------------------------------------------------------------
 // globals

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index debd7522148209bba3bc1f40213b4022c320ebe9..e53e576b0577838bfd06b067ac03a0006613ec43 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -40,8 +40,8 @@
 
 #include "wx/listimpl.cpp"
 
-WX_DEFINE_LIST(wxMenuList);
-WX_DEFINE_LIST(wxMenuItemList);
+WX_DEFINE_LIST(wxMenuList)
+WX_DEFINE_LIST(wxMenuItemList)
 
 // ============================================================================
 // implementation

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index a0a273f76adaae79e797d926403d5a73733a2a1a..8e6ae5d2da14d8237085a68f1ab90df95a36ca62 100644 (file)
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -78,7 +78,7 @@ wxSize wxPrintPaperType::GetSizeDeviceUnits() const
 
 WX_DECLARE_LIST(wxPrintPaperType, wxPrintPaperTypeList);
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxPrintPaperTypeList);
+WX_DEFINE_LIST(wxPrintPaperTypeList)
 
 wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase*) NULL;
 

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index ca03099619a415eb4ad08c208cd11923592cd597..2a46570fa05e1d1524ce25a1462abe87e382d0de 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -98,7 +98,7 @@ wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
 #else
     return new wxPostScriptPrinter( data );
 #endif
-};
+}
 
 wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
     wxPrintout *printout, wxPrintDialogData *data )
@@ -1136,17 +1136,17 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 }
 
 int wxPrintPreviewBase::GetCurrentPage() const
-    { return m_currentPage; };
+    { return m_currentPage; }
 void wxPrintPreviewBase::SetPrintout(wxPrintout *printout)
-    { m_previewPrintout = printout; };
+    { m_previewPrintout = printout; }
 wxPrintout *wxPrintPreviewBase::GetPrintout() const
-    { return m_previewPrintout; };
+    { return m_previewPrintout; }
 wxPrintout *wxPrintPreviewBase::GetPrintoutForPrinting() const
-    { return m_printPrintout; };
+    { return m_printPrintout; }
 void wxPrintPreviewBase::SetFrame(wxFrame *frame)
-    { m_previewFrame = frame; };
+    { m_previewFrame = frame; }
 void wxPrintPreviewBase::SetCanvas(wxPreviewCanvas *canvas)
-    { m_previewCanvas = canvas; };
+    { m_previewCanvas = canvas; }
 wxFrame *wxPrintPreviewBase::GetFrame() const
     { return m_previewFrame; }
 wxPreviewCanvas *wxPrintPreviewBase::GetCanvas() const

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 1029dc6ee2586dfd2d6e6e2b840f6e77fc0787cc..892ae3ebcfac05c05cf9ed969148077c4c22a781 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -46,7 +46,7 @@ IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
 IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
 #endif
 
-WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
+WX_DEFINE_EXPORTED_LIST( wxSizerItemList )
 
 /*
     TODO PROPERTIES

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 084e8218264670b7ff7b8fca4cb0244c8666bb5d..e3a2a150667fb95e244f932eb74586964d24739a 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -32,7 +32,7 @@
 #if wxUSE_STATUSBAR
 
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListString);
+WX_DEFINE_LIST(wxListString)
 
 // ============================================================================
 // wxStatusBarBase implementation

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 22e971fc35f476e19c3fd40de2d282364ad5a1fd..d5d9ef0ff6e39ec477af08c40cb94b94874eddb1 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -48,7 +48,7 @@ END_EVENT_TABLE()
 
 #include "wx/listimpl.cpp"
 
-WX_DEFINE_LIST(wxToolBarToolsList);
+WX_DEFINE_LIST(wxToolBarToolsList)
 
 // ============================================================================
 // implementation

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 2cf222b90ea21bdadc0f7c3b6e29ba87ee38b0c9..ec68425a1a78d2c7a3a541c42066f51a7d97e691 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -72,7 +72,7 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)
 END_EVENT_TABLE()
 
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow);
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow)
 
 bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
                                    const wxPoint& pos,

diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 51a6826af04738545f37fc3d1d16624736f39cc5..ce86219b75d979d53e4654c218d1e6f9e657c70c 100644 (file)
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -52,7 +52,7 @@ struct WXDLLEXPORT wxPaintDCInfo
 
 #include "wx/arrimpl.cpp"
 
-WX_DEFINE_OBJARRAY(wxArrayDCInfo);
+WX_DEFINE_OBJARRAY(wxArrayDCInfo)
 
 // ----------------------------------------------------------------------------
 // macros

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index b111bac7e28ef4fb9282902d20a929f3d6e00cc3..ecac0fae545551781f121194f0d79517b463d967 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -143,7 +143,7 @@ private:
     wxModalEventLoop m_evtLoop;
 };
 
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)
 
 // ============================================================================
 // implementation

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 03d16d993db5c0eb523a6cf6dc87b4067cea770a..54ac1c55cd8ca13371e600d1223a0e46221b9069 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -45,7 +45,7 @@
 
     #include "wx/listimpl.cpp"
 
-    WX_DEFINE_LIST(wxMsgList);
+    WX_DEFINE_LIST(wxMsgList)
 #endif // wxUSE_THREADS
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index fc3ffdfe2acf871ee3648ac9bfb33c846922c8ef..a8355e703a056a588813a8e77b15a8bc57a3a0be 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -48,7 +48,7 @@
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxGDIImageHandlerList);
+WX_DEFINE_LIST(wxGDIImageHandlerList)
 
 // ----------------------------------------------------------------------------
 // private classes

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 6577b0771c9a931b6df934158a246cd1c4d139d6..1771e0ea3f391d46c1c98bedabc2c4eb29294603 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -1652,7 +1652,7 @@ int CALLBACK wxInternalDataCompareFunc(LPARAM lParam1, LPARAM lParam2,  LPARAM l
 
     return internalData->user_fn(d1, d2, internalData->data);
 
-};
+}
 
 bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
 {
@@ -2581,20 +2581,20 @@ static wxListItemInternalData *wxGetInternalData(HWND hwnd, long itemId)
         return NULL;
 
     return (wxListItemInternalData *) it.lParam;
-};
+}
 
 static
 wxListItemInternalData *wxGetInternalData(const wxListCtrl *ctl, long itemId)
 {
     return wxGetInternalData(GetHwndOf(ctl), itemId);
-};
+}
 
 static wxListItemAttr *wxGetInternalDataAttr(wxListCtrl *ctl, long itemId)
 {
     wxListItemInternalData *data = wxGetInternalData(ctl, itemId);
 
     return data ? data->attr : NULL;
-};
+}
 
 static void wxDeleteInternalData(wxListCtrl* ctl, long itemId)
 {

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index feac0435a790779ff25b4b23f05efde7bbf64e7b..f0069e6407f8da70efa957b571437b28426234fb 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -122,7 +122,7 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
 
 #include <wx/listimpl.cpp>
 
-WX_DEFINE_LIST( wxMenuInfoList ) ;
+WX_DEFINE_LIST( wxMenuInfoList )
 
 #if wxUSE_EXTENDED_RTTI
 

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 5e303cf3dd8ed06dd70cb5779122d32c677c6ce6..0d338135846ccdc6a5bdeef0dc90f7ab0cc8dbdc 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -105,7 +105,7 @@ LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
 
 #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/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index 4afb88bd1e443015331d06d5705526f58eb985ef..497f40df3485deb286ef4a1b0838a6be8a1900f0 100644 (file)
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -257,7 +257,7 @@ void wxGetMousePosition( int* x, int* y )
     GetCursorPos( & pt );
     if ( x ) *x = pt.x;
     if ( y ) *y = pt.y;
-};
+}
 
 // Return true if we have a colour display
 bool wxColourDisplay()