From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Sep 2005 11:16:57 +0000 (+0000)
Subject: more extra semicolons removed (patch 1303724)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/259c43f679ca655362b5a439e11c87fc0666d663
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 4cc0dca46d..b64fb8f5d6 100644
--- 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 9f7c88de4b..8ab3f37971 100644
--- 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 3a20b9ed16..f4ec68fde9 100644
--- 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 16f593e9c8..d7497a45ff 100644
--- 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 97b89544ed..99e3947c72 100644
--- 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 debd752214..e53e576b05 100644
--- 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 a0a273f76a..8e6ae5d2da 100644
--- 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 ca03099619..2a46570fa0 100644
--- 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 1029dc6ee2..892ae3ebcf 100644
--- 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 084e821826..e3a2a15066 100644
--- 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 22e971fc35..d5d9ef0ff6 100644
--- 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 2cf222b90e..ec68425a1a 100644
--- 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 51a6826af0..ce86219b75 100644
--- 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 b111bac7e2..ecac0fae54 100644
--- 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 03d16d993d..54ac1c55cd 100644
--- 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 fc3ffdfe2a..a8355e703a 100644
--- 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 6577b0771c..1771e0ea3f 100644
--- 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 feac0435a7..f0069e6407 100644
--- 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 5e303cf3dd..0d33813584 100644
--- 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 4afb88bd1e..497f40df34 100644
--- 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()