AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

applied patch #1356901 "Yet another removal of extra semicolons", also fixed remaining similar cases of extra semicolons

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth 2005-11-20 21:55:35 +00:00
parent 84ac8772b7
commit 412e0d47c0
26 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/samples/applet/monitorapplet.cpp
View File

@ -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)

6
contrib/src/applet/appletwindow.cpp
View File

@ -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:

4
contrib/src/applet/loadpage.cpp
View File

@ -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:

42
contrib/src/plot/plot.cpp
View File

@ -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!)

4
samples/opengl/penguin/dxfrenderer.cpp
View File

@ -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] = {

2
src/common/list.cpp
View File

@ -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) )

14
src/common/mediactrlcmn.cpp
View File

@ -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

2
src/common/wincmn.cpp
View File

@ -2365,7 +2365,7 @@ wxAccessible* wxWindowBase::CreateAccessible()
#if wxUSE_STL
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxWindowList);
WX_DEFINE_LIST(wxWindowList)
#else

2
src/generic/filedlgg.cpp
View File

@ -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

4
src/generic/regiong.cpp
View File

@ -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()
{

2
src/mac/carbon/accel.cpp
View File

@ -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

4
src/mac/carbon/mediactrl.cpp
View File

@ -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

2
src/mac/classic/accel.cpp
View File

@ -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

4
src/mgl/fontutil.cpp
View File

@ -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)

8
src/msw/mediactrl.cpp
View File

@ -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

2
src/os2/gdiimage.cpp
View File

@ -30,7 +30,7 @@
#include "wx/os2/gdiimage.h"
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxGDIImageHandlerList);
WX_DEFINE_LIST(wxGDIImageHandlerList)
// ----------------------------------------------------------------------------
// private classes

2
src/palmos/gdiimage.cpp
View File

@ -41,7 +41,7 @@
#include "wx/file.h"
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxGDIImageHandlerList);
WX_DEFINE_LIST(wxGDIImageHandlerList)
// ----------------------------------------------------------------------------
// auxiliary functions

2
src/palmos/menu.cpp
View File

@ -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

2
src/palmos/notebook.cpp
View File

@ -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)

4
src/richtext/richtextbuffer.cpp
View File

@ -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

2
src/univ/toolbar.cpp
View File

@ -128,7 +128,7 @@ private:
// wxToolBar implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
// ----------------------------------------------------------------------------
// wxToolBar creation

4
src/unix/mediactrl.cpp
View File

@ -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

2
tests/hashes/hashes.cpp
View File

@ -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()

4
tests/lists/lists.cpp
View File

@ -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()
{

4
wxPython/contrib/gizmos/wxCode/src/treelistctrl.cpp
View File

@ -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)

14
wxPython/contrib/iewin/IEHtmlWin.cpp
View File

@ -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);
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);
IMPLEMENT_DYNAMIC_CLASS(wxMSHTMLEvent, wxNotifyEvent)
//////////////////////////////////////////////////////////////////////