From c0c133e13b36a923c65f94499554e432bc3a0daa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 8 Feb 2009 11:45:59 +0000 Subject: [PATCH] add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + include/wx/access.h | 2 +- include/wx/anidecod.h | 2 +- include/wx/app.h | 4 ++-- include/wx/arrstr.h | 2 +- include/wx/bmpbuttn.h | 2 +- include/wx/bookctrl.h | 2 +- include/wx/buffer.h | 2 +- include/wx/button.h | 2 +- include/wx/cairo.h | 2 +- include/wx/caret.h | 6 +++--- include/wx/checkbox.h | 2 +- include/wx/checklst.h | 2 +- include/wx/choice.h | 2 +- include/wx/clipbrd.h | 2 +- include/wx/cmdargs.h | 2 +- include/wx/cmdline.h | 2 +- include/wx/cmdproc.h | 2 +- include/wx/cocoa/cursor.h | 2 +- include/wx/cocoa/dc.h | 2 +- include/wx/cocoa/dirdlg.h | 2 +- include/wx/cocoa/evtloop.h | 2 +- include/wx/cocoa/filedlg.h | 2 +- include/wx/cocoa/msgdlg.h | 2 +- include/wx/cocoa/private/scrollview.h | 2 +- include/wx/cocoa/trackingrectmanager.h | 2 +- include/wx/cocoa/window.h | 2 +- include/wx/confbase.h | 2 +- include/wx/containr.h | 2 +- include/wx/control.h | 2 +- include/wx/convauto.h | 2 +- include/wx/cshelp.h | 2 +- include/wx/ctrlsub.h | 4 ++-- include/wx/dataobj.h | 12 ++++++------ include/wx/datstrm.h | 4 ++-- include/wx/dc.h | 12 ++++++------ include/wx/dcbuffer.h | 6 +++--- include/wx/dcgraph.h | 4 ++-- include/wx/dcmirror.h | 4 ++-- include/wx/defs.h | 26 ++++++++++++++++--------- include/wx/dfb/dcclient.h | 6 +++--- include/wx/dfb/evtloop.h | 2 +- include/wx/dfb/window.h | 2 +- include/wx/dialog.h | 2 +- include/wx/dialup.h | 2 +- include/wx/dir.h | 2 +- include/wx/display.h | 2 +- include/wx/display_impl.h | 2 +- include/wx/dnd.h | 8 ++++---- include/wx/docmdi.h | 4 ++-- include/wx/docview.h | 16 +++++++-------- include/wx/dynlib.h | 2 +- include/wx/dynload.h | 4 ++-- include/wx/encconv.h | 2 +- include/wx/event.h | 16 +++++++-------- include/wx/evtloop.h | 4 ++-- include/wx/fdrepdlg.h | 2 +- include/wx/fileconf.h | 2 +- include/wx/filedlg.h | 2 +- include/wx/filesys.h | 4 ++-- include/wx/fmappriv.h | 2 +- include/wx/fontdlg.h | 2 +- include/wx/fontenum.h | 2 +- include/wx/fontmap.h | 4 ++-- include/wx/frame.h | 2 +- include/wx/fs_arc.h | 2 +- include/wx/fs_filter.h | 2 +- include/wx/gauge.h | 2 +- include/wx/gbsizer.h | 4 ++-- include/wx/gdicmn.h | 2 +- include/wx/generic/busyinfo.h | 2 +- include/wx/generic/calctrlg.h | 2 +- include/wx/generic/choicdgg.h | 2 +- include/wx/generic/ctrlsub.h | 2 +- include/wx/generic/dataview.h | 2 +- include/wx/generic/datectrl.h | 2 +- include/wx/generic/dirctrlg.h | 4 ++-- include/wx/generic/dragimgg.h | 2 +- include/wx/generic/grid.h | 14 ++++++------- include/wx/generic/grideditors.h | 16 +++++++-------- include/wx/generic/gridsel.h | 2 +- include/wx/generic/headerctrlg.h | 2 +- include/wx/generic/logg.h | 4 ++-- include/wx/generic/notifmsg.h | 2 +- include/wx/generic/numdlgg.h | 2 +- include/wx/generic/private/grid.h | 14 ++++++------- include/wx/generic/progdlgg.h | 2 +- include/wx/generic/sashwin.h | 2 +- include/wx/generic/scrolwin.h | 2 +- include/wx/generic/splash.h | 4 ++-- include/wx/generic/splitter.h | 2 +- include/wx/generic/textdlgg.h | 4 ++-- include/wx/generic/treectlg.h | 2 +- include/wx/generic/wizard.h | 2 +- include/wx/gifdecod.h | 2 +- include/wx/graphics.h | 4 ++-- include/wx/gtk/calctrl.h | 2 +- include/wx/gtk/dataview.h | 2 +- include/wx/gtk/evtloop.h | 2 +- include/wx/gtk/gnome/gprint.h | 4 ++-- include/wx/gtk/hildon/notifmsg.h | 2 +- include/wx/gtk/print.h | 4 ++-- include/wx/gtk/private/object.h | 2 +- include/wx/gtk/private/string.h | 2 +- include/wx/gtk/scrolwin.h | 2 +- include/wx/gtk/window.h | 2 +- include/wx/gtk1/scrolwin.h | 2 +- include/wx/gtk1/window.h | 2 +- include/wx/hash.h | 2 +- include/wx/hashmap.h | 2 +- include/wx/headerctrl.h | 2 +- include/wx/html/helpctrl.h | 2 +- include/wx/html/helpdata.h | 6 +++--- include/wx/html/helpdlg.h | 2 +- include/wx/html/helpfrm.h | 2 +- include/wx/html/helpwnd.h | 2 +- include/wx/html/htmlcell.h | 12 ++++++------ include/wx/html/htmlpars.h | 6 +++--- include/wx/html/htmltag.h | 4 ++-- include/wx/html/htmlwin.h | 2 +- include/wx/html/htmprint.h | 6 +++--- include/wx/html/winpars.h | 4 ++-- include/wx/htmllbox.h | 4 ++-- include/wx/intl.h | 2 +- include/wx/ipcbase.h | 2 +- include/wx/list.h | 2 +- include/wx/listbox.h | 2 +- include/wx/log.h | 10 +++++----- include/wx/memconf.h | 2 +- include/wx/memtext.h | 2 +- include/wx/menu.h | 4 ++-- include/wx/mgl/window.h | 2 +- include/wx/motif/ctrlsub.h | 2 +- include/wx/motif/window.h | 2 +- include/wx/msgdlg.h | 4 ++-- include/wx/mstream.h | 4 ++-- include/wx/msw/app.h | 2 +- include/wx/msw/calctrl.h | 2 +- include/wx/msw/caret.h | 2 +- include/wx/msw/ctrlsub.h | 2 +- include/wx/msw/dc.h | 4 ++-- include/wx/msw/dcclient.h | 8 ++++---- include/wx/msw/dcmemory.h | 2 +- include/wx/msw/dcprint.h | 2 +- include/wx/msw/dcscreen.h | 2 +- include/wx/msw/dde.h | 2 +- include/wx/msw/dialog.h | 2 +- include/wx/msw/dragimag.h | 2 +- include/wx/msw/enhmeta.h | 4 ++-- include/wx/msw/fdrepdlg.h | 2 +- include/wx/msw/filedlg.h | 2 +- include/wx/msw/headerctrl.h | 2 +- include/wx/msw/helpbest.h | 2 +- include/wx/msw/iniconf.h | 2 +- include/wx/msw/listctrl.h | 2 +- include/wx/msw/mdi.h | 2 +- include/wx/msw/metafile.h | 4 ++-- include/wx/msw/msgdlg.h | 2 +- include/wx/msw/notifmsg.h | 2 +- include/wx/msw/ole/access.h | 2 +- include/wx/msw/ole/automtn.h | 2 +- include/wx/msw/ole/dataobj.h | 2 +- include/wx/msw/ole/dataobj2.h | 8 ++++---- include/wx/msw/ole/dropsrc.h | 2 +- include/wx/msw/ole/droptgt.h | 2 +- include/wx/msw/printdlg.h | 2 +- include/wx/msw/printwin.h | 2 +- include/wx/msw/private.h | 16 +++++++-------- include/wx/msw/private/sockmsw.h | 2 +- include/wx/msw/radiobox.h | 2 +- include/wx/msw/regconf.h | 2 +- include/wx/msw/registry.h | 2 +- include/wx/msw/sound.h | 2 +- include/wx/msw/spinctrl.h | 2 +- include/wx/msw/statbmp.h | 2 +- include/wx/msw/subwin.h | 2 +- include/wx/msw/tls.h | 2 +- include/wx/msw/toolbar.h | 2 +- include/wx/msw/tooltip.h | 2 +- include/wx/msw/toplevel.h | 2 +- include/wx/msw/treectrl.h | 2 +- include/wx/msw/uxtheme.h | 4 ++-- include/wx/msw/wince/tbarwce.h | 4 ++-- include/wx/msw/window.h | 2 +- include/wx/msw/wrapshl.h | 2 +- include/wx/nativewin.h | 2 +- include/wx/notebook.h | 2 +- include/wx/notifmsg.h | 2 +- include/wx/object.h | 2 +- include/wx/os2/app.h | 2 +- include/wx/os2/dcclient.h | 6 +++--- include/wx/os2/dcmemory.h | 2 +- include/wx/os2/dcprint.h | 2 +- include/wx/os2/dcscreen.h | 2 +- include/wx/os2/dialog.h | 2 +- include/wx/os2/listctrl.h | 2 +- include/wx/os2/metafile.h | 4 ++-- include/wx/os2/tls.h | 2 +- include/wx/os2/treectrl.h | 2 +- include/wx/os2/window.h | 2 +- include/wx/osx/carbon/dataview.h | 2 +- include/wx/osx/core/private.h | 2 +- include/wx/osx/dcclient.h | 6 +++--- include/wx/osx/dcmemory.h | 2 +- include/wx/osx/dcscreen.h | 2 +- include/wx/osx/glcanvas.h | 2 +- include/wx/osx/metafile.h | 4 ++-- include/wx/osx/window.h | 2 +- include/wx/overlay.h | 4 ++-- include/wx/palmos/app.h | 2 +- include/wx/palmos/caret.h | 2 +- include/wx/palmos/dc.h | 4 ++-- include/wx/palmos/dcclient.h | 6 +++--- include/wx/palmos/dcmemory.h | 2 +- include/wx/palmos/dcscreen.h | 2 +- include/wx/palmos/dialog.h | 2 +- include/wx/palmos/dragimag.h | 2 +- include/wx/palmos/enhmeta.h | 4 ++-- include/wx/palmos/fdrepdlg.h | 2 +- include/wx/palmos/filedlg.h | 2 +- include/wx/palmos/listctrl.h | 2 +- include/wx/palmos/mdi.h | 2 +- include/wx/palmos/msgdlg.h | 2 +- include/wx/palmos/pen.h | 2 +- include/wx/palmos/prefconf.h | 2 +- include/wx/palmos/printdlg.h | 4 ++-- include/wx/palmos/printpalm.h | 2 +- include/wx/palmos/progdlg.h | 2 +- include/wx/palmos/radiobox.h | 2 +- include/wx/palmos/sound.h | 2 +- include/wx/palmos/spinctrl.h | 2 +- include/wx/palmos/statbmp.h | 2 +- include/wx/palmos/toolbar.h | 2 +- include/wx/palmos/tooltip.h | 2 +- include/wx/palmos/toplevel.h | 2 +- include/wx/palmos/treectrl.h | 2 +- include/wx/palmos/window.h | 2 +- include/wx/persist.h | 4 ++-- include/wx/persist/window.h | 2 +- include/wx/popupwin.h | 4 ++-- include/wx/printdlg.h | 8 ++++---- include/wx/private/fileback.h | 2 +- include/wx/private/socket.h | 2 +- include/wx/private/timer.h | 2 +- include/wx/prntbase.h | 20 +++++++++---------- include/wx/process.h | 2 +- include/wx/protocol/http.h | 2 +- include/wx/protocol/protocol.h | 2 +- include/wx/rearrangectrl.h | 6 +++--- include/wx/renderer.h | 2 +- include/wx/richtext/richtextprint.h | 4 ++-- include/wx/richtext/richtextsymboldlg.h | 2 +- include/wx/sckipc.h | 4 ++-- include/wx/sckstrm.h | 6 +++--- include/wx/scrolbar.h | 2 +- include/wx/scrolwin.h | 4 ++-- include/wx/selstore.h | 2 +- include/wx/sizer.h | 8 ++++---- include/wx/slider.h | 2 +- include/wx/snglinst.h | 2 +- include/wx/socket.h | 8 ++++---- include/wx/spinbutt.h | 2 +- include/wx/spinctrl.h | 2 +- include/wx/sstream.h | 4 ++-- include/wx/statbmp.h | 2 +- include/wx/statbox.h | 2 +- include/wx/statline.h | 2 +- include/wx/stattext.h | 2 +- include/wx/statusbr.h | 2 +- include/wx/strconv.h | 2 +- include/wx/stream.h | 18 ++++++++--------- include/wx/string.h | 20 +++++++++---------- include/wx/strvararg.h | 2 +- include/wx/tarstrm.h | 4 ++-- include/wx/taskbar.h | 4 ++-- include/wx/tbarbase.h | 2 +- include/wx/textctrl.h | 6 +++--- include/wx/textfile.h | 2 +- include/wx/tglbtn.h | 2 +- include/wx/thread.h | 10 +++++----- include/wx/thrimpl.cpp | 2 +- include/wx/timer.h | 4 ++-- include/wx/tipwin.h | 2 +- include/wx/toplevel.h | 2 +- include/wx/treectrl.h | 2 +- include/wx/txtstrm.h | 4 ++-- include/wx/univ/stdrend.h | 2 +- include/wx/unix/evtloop.h | 2 +- include/wx/unix/tls.h | 2 +- include/wx/utils.h | 2 +- include/wx/valgen.h | 2 +- include/wx/validate.h | 2 +- include/wx/valtext.h | 2 +- include/wx/vlbox.h | 2 +- include/wx/vscroll.h | 6 +++--- include/wx/wfstream.h | 14 ++++++------- include/wx/window.h | 2 +- include/wx/wizard.h | 2 +- include/wx/wupdlock.h | 2 +- include/wx/x11/window.h | 2 +- include/wx/xlocale.h | 4 ++-- include/wx/xti.h | 2 +- include/wx/zipstrm.h | 4 ++-- include/wx/zstream.h | 4 ++-- interface/wx/defs.h | 22 +++++++++++---------- samples/collpane/collpane.cpp | 6 +++--- samples/debugrpt/debugrpt.cpp | 4 ++-- samples/dialogs/dialogs.cpp | 2 +- samples/dialogs/dialogs.h | 2 +- samples/docview/doc.h | 4 ++-- samples/docview/docview.h | 2 +- samples/flash/flash.cpp | 4 ++-- samples/grid/griddemo.cpp | 2 +- samples/htlbox/htlbox.cpp | 2 +- samples/html/test/test.cpp | 2 +- samples/ipc/baseserver.cpp | 2 +- samples/listctrl/listtest.h | 6 +++--- samples/opengl/isosurf/isosurf.h | 2 +- samples/opengl/penguin/penguin.h | 2 +- samples/splitter/splitter.cpp | 8 ++++---- samples/widgets/itemcontainer.cpp | 2 +- src/cocoa/display.mm | 4 ++-- src/cocoa/window.mm | 8 ++++---- src/common/cshelp.cpp | 2 +- src/common/dircmn.cpp | 4 ++-- src/common/dpycmn.cpp | 2 +- src/common/execcmn.cpp | 2 +- src/common/fileconf.cpp | 6 +++--- src/common/fontmap.cpp | 2 +- src/common/fs_mem.cpp | 2 +- src/common/ftp.cpp | 4 ++-- src/common/gifdecod.cpp | 2 +- src/common/http.cpp | 2 +- src/common/image.cpp | 2 +- src/common/init.cpp | 6 +++--- src/common/intl.cpp | 2 +- src/common/popupcmn.cpp | 4 ++-- src/common/rendcmn.cpp | 2 +- src/common/sckipc.cpp | 8 ++++---- src/common/socket.cpp | 8 ++++---- src/common/strconv.cpp | 2 +- src/common/wincmn.cpp | 2 +- src/common/wrapsizer.cpp | 2 +- src/common/zipstrm.cpp | 8 ++++---- src/generic/busyinfo.cpp | 2 +- src/generic/datavgen.cpp | 2 +- src/generic/dbgrptg.cpp | 6 +++--- src/generic/graphicc.cpp | 2 +- src/generic/htmllbox.cpp | 2 +- src/generic/logg.cpp | 4 ++-- src/generic/notifmsgg.cpp | 2 +- src/generic/scrlwing.cpp | 4 ++-- src/generic/tipdlg.cpp | 4 ++-- src/generic/tipwin.cpp | 2 +- src/generic/treectlg.cpp | 8 ++++---- src/generic/vscroll.cpp | 2 +- src/gtk/aboutdlg.cpp | 2 +- src/gtk/clipbrd.cpp | 2 +- src/gtk/colour.cpp | 2 +- src/gtk/gnome/gprint.cpp | 2 +- src/html/helpdata.cpp | 4 ++-- src/html/helpwnd.cpp | 4 ++-- src/html/htmlpars.cpp | 4 ++-- src/html/htmlwin.cpp | 2 +- src/html/m_hline.cpp | 2 +- src/html/m_image.cpp | 8 ++++---- src/html/m_layout.cpp | 2 +- src/html/m_links.cpp | 2 +- src/html/m_list.cpp | 4 ++-- src/html/m_tables.cpp | 2 +- src/msw/accel.cpp | 2 +- src/msw/app.cpp | 2 +- src/msw/checklst.cpp | 2 +- src/msw/dc.cpp | 8 ++++---- src/msw/dialup.cpp | 4 ++-- src/msw/dir.cpp | 2 +- src/msw/display.cpp | 12 ++++++------ src/msw/dlmsw.cpp | 2 +- src/msw/fdrepdlg.cpp | 2 +- src/msw/fontenum.cpp | 2 +- src/msw/listctrl.cpp | 4 ++-- src/msw/mediactrl.cpp | 2 +- src/msw/mediactrl_am.cpp | 2 +- src/msw/mediactrl_qt.cpp | 2 +- src/msw/mediactrl_wmp10.cpp | 2 +- src/msw/notifmsg.cpp | 4 ++-- src/msw/ole/access.cpp | 4 ++-- src/msw/ole/dataobj.cpp | 6 +++--- src/msw/ole/dropsrc.cpp | 2 +- src/msw/ole/droptgt.cpp | 2 +- src/msw/pen.cpp | 2 +- src/msw/region.cpp | 2 +- src/msw/renderer.cpp | 4 ++-- src/msw/snglinst.cpp | 2 +- src/msw/sound.cpp | 4 ++-- src/msw/textctrl.cpp | 2 +- src/msw/textentry.cpp | 2 +- src/msw/thread.cpp | 6 +++--- src/msw/toolbar.cpp | 2 +- src/msw/treectrl.cpp | 10 +++++----- src/msw/urlmsw.cpp | 2 +- src/msw/utils.cpp | 2 +- src/msw/utilsexc.cpp | 4 ++-- src/os2/pen.cpp | 2 +- src/os2/treectrl.cpp | 2 +- src/osx/carbon/cursor.cpp | 2 +- src/osx/carbon/mediactrl.cpp | 2 +- src/osx/carbon/taskbar.cpp | 2 +- src/osx/carbon/textctrl.cpp | 4 ++-- src/osx/carbon/thread.cpp | 2 +- src/osx/cocoa/taskbar.mm | 2 +- src/osx/core/display.cpp | 4 ++-- src/osx/core/sockosx.cpp | 2 +- src/osx/palette.cpp | 2 +- src/palmos/accel.cpp | 2 +- src/palmos/bitmap.cpp | 2 +- src/palmos/checklst.cpp | 2 +- src/palmos/fdrepdlg.cpp | 2 +- src/palmos/snglinst.cpp | 2 +- src/palmos/thread.cpp | 6 +++--- src/palmos/toolbar.cpp | 2 +- src/unix/displayx11.cpp | 6 +++--- src/unix/stackwalk.cpp | 2 +- src/unix/utilsunx.cpp | 8 ++++---- 424 files changed, 715 insertions(+), 704 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 24dcd34498..aa89d7deb3 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -340,6 +340,7 @@ All: - Handle exceptions thrown from overridden wxView::OnCreate() gracefully. - Added wxPATH_RMDIR_FULL/RECURSIVE wxFileName::Rmdir() flags (Marcin Malich). - Added wxStandardPaths::GetAppDocumentsDir(). +- Added wx-prefixed versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros. All (Unix): diff --git a/include/wx/access.h b/include/wx/access.h index 8e3f6d6ccc..6f098623de 100644 --- a/include/wx/access.h +++ b/include/wx/access.h @@ -230,7 +230,7 @@ class WXDLLIMPEXP_FWD_CORE wxPoint; class WXDLLIMPEXP_FWD_CORE wxRect; class WXDLLIMPEXP_CORE wxAccessibleBase : public wxObject { - DECLARE_NO_COPY_CLASS(wxAccessibleBase) + wxDECLARE_NO_COPY_CLASS(wxAccessibleBase); public: wxAccessibleBase(wxWindow* win): m_window(win) {} diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h index 733e5b3e1e..5d4a062be1 100644 --- a/include/wx/anidecod.h +++ b/include/wx/anidecod.h @@ -68,7 +68,7 @@ private: static wxCURHandler sm_handler; - DECLARE_NO_COPY_CLASS(wxANIDecoder) + wxDECLARE_NO_COPY_CLASS(wxANIDecoder); }; diff --git a/include/wx/app.h b/include/wx/app.h index 278d540a1c..a5b60fed2b 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -435,7 +435,7 @@ protected: // the application object is a singleton anyhow, there is no sense in // copying it - DECLARE_NO_COPY_CLASS(wxAppConsoleBase) + wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase); }; #if defined(__UNIX__) @@ -631,7 +631,7 @@ protected: bool m_isInsideYield; long m_eventsToProcessInsideYield; - DECLARE_NO_COPY_CLASS(wxAppBase) + wxDECLARE_NO_COPY_CLASS(wxAppBase); }; #if WXWIN_COMPATIBILITY_2_6 diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h index f54844459b..cdba3806d3 100644 --- a/include/wx/arrstr.h +++ b/include/wx/arrstr.h @@ -461,7 +461,7 @@ private: const wxArrayString * array; } m_data; - DECLARE_NO_ASSIGN_CLASS(wxArrayStringsAdapter) + wxDECLARE_NO_ASSIGN_CLASS(wxArrayStringsAdapter); }; #endif // _WX_ARRSTR_H diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 4ebb839dfd..0ac15ef292 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -89,7 +89,7 @@ protected: m_marginY; - DECLARE_NO_COPY_CLASS(wxBitmapButtonBase) + wxDECLARE_NO_COPY_CLASS(wxBitmapButtonBase); }; #if WXWIN_COMPATIBILITY_2_6 diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index 9085595d68..8ecfbef190 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -336,7 +336,7 @@ private: unsigned int m_internalBorder; DECLARE_ABSTRACT_CLASS(wxBookCtrlBase) - DECLARE_NO_COPY_CLASS(wxBookCtrlBase) + wxDECLARE_NO_COPY_CLASS(wxBookCtrlBase); DECLARE_EVENT_TABLE() }; diff --git a/include/wx/buffer.h b/include/wx/buffer.h index 4cc340aa51..51214ee997 100644 --- a/include/wx/buffer.h +++ b/include/wx/buffer.h @@ -357,7 +357,7 @@ private: // the reference count size_t m_ref; - DECLARE_NO_COPY_CLASS(wxMemoryBufferData) + wxDECLARE_NO_COPY_CLASS(wxMemoryBufferData); }; diff --git a/include/wx/button.h b/include/wx/button.h index 519d0b7ffe..25d56365f0 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -81,7 +81,7 @@ protected: // choose the default border for this window virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - DECLARE_NO_COPY_CLASS(wxButtonBase) + wxDECLARE_NO_COPY_CLASS(wxButtonBase); }; #if defined(__WXUNIVERSAL__) diff --git a/include/wx/cairo.h b/include/wx/cairo.h index acb961c83f..a6041f2418 100644 --- a/include/wx/cairo.h +++ b/include/wx/cairo.h @@ -146,7 +146,7 @@ public: wxDL_VOIDMETHOD_DEFINE( pango_cairo_show_layout, (cairo_t *cr, PangoLayout *layout), (cr, layout) ) - DECLARE_NO_COPY_CLASS(wxCairoLibrary) + wxDECLARE_NO_COPY_CLASS(wxCairoLibrary); }; #endif // wxUSE_CAIRO diff --git a/include/wx/caret.h b/include/wx/caret.h index b89796ff88..c0a30bb893 100644 --- a/include/wx/caret.h +++ b/include/wx/caret.h @@ -186,7 +186,7 @@ protected: int m_countVisible; private: - DECLARE_NO_COPY_CLASS(wxCaretBase) + wxDECLARE_NO_COPY_CLASS(wxCaretBase); }; // --------------------------------------------------------------------------- @@ -213,7 +213,7 @@ class WXDLLIMPEXP_CORE wxCaretSuspend public: wxCaretSuspend(wxWindow *WXUNUSED(win)) {} - DECLARE_NO_COPY_CLASS(wxCaretSuspend) + wxDECLARE_NO_COPY_CLASS(wxCaretSuspend); }; #else // !wxHAS_CARET_USING_OVERLAYS @@ -242,7 +242,7 @@ private: wxCaret *m_caret; bool m_show; - DECLARE_NO_COPY_CLASS(wxCaretSuspend) + wxDECLARE_NO_COPY_CLASS(wxCaretSuspend); }; #endif // wxHAS_CARET_USING_OVERLAYS/!wxHAS_CARET_USING_OVERLAYS diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index e471358b21..60a8189f24 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -130,7 +130,7 @@ protected: } private: - DECLARE_NO_COPY_CLASS(wxCheckBoxBase) + wxDECLARE_NO_COPY_CLASS(wxCheckBoxBase); }; #if defined(__WXUNIVERSAL__) diff --git a/include/wx/checklst.h b/include/wx/checklst.h index f7ec1a8762..3d38f28810 100644 --- a/include/wx/checklst.h +++ b/include/wx/checklst.h @@ -35,7 +35,7 @@ public: virtual bool IsChecked(unsigned int item) const = 0; virtual void Check(unsigned int item, bool check = true) = 0; - DECLARE_NO_COPY_CLASS(wxCheckListBoxBase) + wxDECLARE_NO_COPY_CLASS(wxCheckListBoxBase); }; #if defined(__WXUNIVERSAL__) diff --git a/include/wx/choice.h b/include/wx/choice.h index 18d31d2c12..6f3c75563c 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -59,7 +59,7 @@ public: virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } private: - DECLARE_NO_COPY_CLASS(wxChoiceBase) + wxDECLARE_NO_COPY_CLASS(wxChoiceBase); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 3c018f3281..9d1c67cd62 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -189,7 +189,7 @@ public: private: wxClipboard *m_clipboard; - DECLARE_NO_COPY_CLASS(wxClipboardLocker) + wxDECLARE_NO_COPY_CLASS(wxClipboardLocker); }; #endif // wxUSE_CLIPBOARD diff --git a/include/wx/cmdargs.h b/include/wx/cmdargs.h index a120c45870..3f99cb50eb 100644 --- a/include/wx/cmdargs.h +++ b/include/wx/cmdargs.h @@ -136,7 +136,7 @@ private: mutable char **m_argsA; mutable wchar_t **m_argsW; - DECLARE_NO_COPY_CLASS(wxCmdLineArgsArray) + wxDECLARE_NO_COPY_CLASS(wxCmdLineArgsArray); }; // provide global operator overload for compatibility with the existing code diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h index 10bf956eb0..dcd76f7218 100644 --- a/include/wx/cmdline.h +++ b/include/wx/cmdline.h @@ -250,7 +250,7 @@ private: struct wxCmdLineParserData *m_data; - DECLARE_NO_COPY_CLASS(wxCmdLineParser) + wxDECLARE_NO_COPY_CLASS(wxCmdLineParser); }; #else // !wxUSE_CMDLINE_PARSER diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h index cba83770dd..6072e7fda0 100644 --- a/include/wx/cmdproc.h +++ b/include/wx/cmdproc.h @@ -137,7 +137,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxCommandProcessor) - DECLARE_NO_COPY_CLASS(wxCommandProcessor) + wxDECLARE_NO_COPY_CLASS(wxCommandProcessor); }; #endif // _WX_CMDPROC_H_ diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index f6b70f10c2..e3b3f09ca5 100644 --- a/include/wx/cocoa/cursor.h +++ b/include/wx/cocoa/cursor.h @@ -27,7 +27,7 @@ protected: friend class WXDLLIMPEXP_FWD_CORE wxBitmap; friend class WXDLLIMPEXP_FWD_CORE wxCursor; - DECLARE_NO_COPY_CLASS(wxCursorRefData) + wxDECLARE_NO_COPY_CLASS(wxCursorRefData); }; #define M_CURSORDATA ((wxCursorRefData *)m_refData) diff --git a/include/wx/cocoa/dc.h b/include/wx/cocoa/dc.h index 4cbe3df7be..31c565f26c 100644 --- a/include/wx/cocoa/dc.h +++ b/include/wx/cocoa/dc.h @@ -25,7 +25,7 @@ WX_DECLARE_LIST(wxCocoaDCImpl, wxCocoaDCStack); class WXDLLIMPEXP_CORE wxCocoaDCImpl: public wxDCImpl { DECLARE_ABSTRACT_CLASS(wxCocoaDCImpl) - DECLARE_NO_COPY_CLASS(wxCocoaDCImpl) + wxDECLARE_NO_COPY_CLASS(wxCocoaDCImpl); //------------------------------------------------------------------------- // Initialization //------------------------------------------------------------------------- diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h index 5a4017d642..29f4e9d471 100644 --- a/include/wx/cocoa/dirdlg.h +++ b/include/wx/cocoa/dirdlg.h @@ -22,7 +22,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel); class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase { DECLARE_DYNAMIC_CLASS(wxDirDialog) - DECLARE_NO_COPY_CLASS(wxDirDialog) + wxDECLARE_NO_COPY_CLASS(wxDirDialog); public: wxDirDialog(wxWindow *parent, const wxString& message = wxDirSelectorPromptStr, diff --git a/include/wx/cocoa/evtloop.h b/include/wx/cocoa/evtloop.h index c3ff21eb17..b61f011185 100644 --- a/include/wx/cocoa/evtloop.h +++ b/include/wx/cocoa/evtloop.h @@ -30,7 +30,7 @@ public: protected: int m_exitcode; - DECLARE_NO_COPY_CLASS(wxGUIEventLoop) + wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); }; #endif // _WX_COCOA_EVTLOOP_H_ diff --git a/include/wx/cocoa/filedlg.h b/include/wx/cocoa/filedlg.h index 4c168bf14c..62f5561851 100644 --- a/include/wx/cocoa/filedlg.h +++ b/include/wx/cocoa/filedlg.h @@ -22,7 +22,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel); class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase { DECLARE_DYNAMIC_CLASS(wxFileDialog) - DECLARE_NO_COPY_CLASS(wxFileDialog) + wxDECLARE_NO_COPY_CLASS(wxFileDialog); public: wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, diff --git a/include/wx/cocoa/msgdlg.h b/include/wx/cocoa/msgdlg.h index a490cf49d6..90cfdc23e9 100644 --- a/include/wx/cocoa/msgdlg.h +++ b/include/wx/cocoa/msgdlg.h @@ -64,7 +64,7 @@ protected: virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label); DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog) - DECLARE_NO_COPY_CLASS(wxCocoaMessageDialog) + wxDECLARE_NO_COPY_CLASS(wxCocoaMessageDialog); }; #endif // _WX_MSGDLG_H_ diff --git a/include/wx/cocoa/private/scrollview.h b/include/wx/cocoa/private/scrollview.h index dd2bdc1480..7e5331ebc5 100644 --- a/include/wx/cocoa/private/scrollview.h +++ b/include/wx/cocoa/private/scrollview.h @@ -19,7 +19,7 @@ // ======================================================================== class wxWindowCocoaScrollView: protected wxCocoaNSView { - DECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView) + wxDECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView); public: wxWindowCocoaScrollView(wxWindow *owner); virtual ~wxWindowCocoaScrollView(); diff --git a/include/wx/cocoa/trackingrectmanager.h b/include/wx/cocoa/trackingrectmanager.h index da4483db53..839685812c 100644 --- a/include/wx/cocoa/trackingrectmanager.h +++ b/include/wx/cocoa/trackingrectmanager.h @@ -18,7 +18,7 @@ class wxCocoaTrackingRectManager { - DECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager) + wxDECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager); public: wxCocoaTrackingRectManager(wxWindow *window); void ClearTrackingRect(); diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h index c0ae13a74d..309cb29e5f 100644 --- a/include/wx/cocoa/window.h +++ b/include/wx/cocoa/window.h @@ -46,7 +46,7 @@ class wxCocoaTrackingRectManager; class WXDLLIMPEXP_CORE wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView { DECLARE_DYNAMIC_CLASS(wxWindowCocoa) - DECLARE_NO_COPY_CLASS(wxWindowCocoa) + wxDECLARE_NO_COPY_CLASS(wxWindowCocoa); DECLARE_EVENT_TABLE() friend wxWindow *wxWindowBase::GetCapture(); friend class wxWindowCocoaScrollView; diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 32ecdde962..3f7b02e35d 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -437,7 +437,7 @@ private: m_strOldPath; // saved path bool m_bChanged; // was the path changed? - DECLARE_NO_COPY_CLASS(wxConfigPathChanger) + wxDECLARE_NO_COPY_CLASS(wxConfigPathChanger); }; diff --git a/include/wx/containr.h b/include/wx/containr.h index 7dcf2a048e..d4648b841a 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -215,7 +215,7 @@ public: protected: - DECLARE_NO_COPY_CLASS(wxControlContainer) + wxDECLARE_NO_COPY_CLASS(wxControlContainer); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/control.h b/include/wx/control.h index e2db727b4c..eaa6221123 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -135,7 +135,7 @@ protected: // this field contains the label in wx format, i.e. with '&' mnemonics wxString m_labelOrig; - DECLARE_NO_COPY_CLASS(wxControlBase) + wxDECLARE_NO_COPY_CLASS(wxControlBase); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/convauto.h b/include/wx/convauto.h index 551f1dc96c..b3dde4c73a 100644 --- a/include/wx/convauto.h +++ b/include/wx/convauto.h @@ -137,7 +137,7 @@ private: bool m_consumedBOM; - DECLARE_NO_ASSIGN_CLASS(wxConvAuto) + wxDECLARE_NO_ASSIGN_CLASS(wxConvAuto); }; #endif // wxUSE_WCHAR_T diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h index fc9fde211a..19f6d4c700 100644 --- a/include/wx/cshelp.h +++ b/include/wx/cshelp.h @@ -232,7 +232,7 @@ public: protected: wxHelpControllerBase* m_helpController; - DECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider) + wxDECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider); }; // Convenience function for turning context id into wxString diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 109369b489..74dcd4b47d 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -437,7 +437,7 @@ protected: void InitCommandEventWithItems(wxCommandEvent& event, int n); private: - DECLARE_NO_COPY_CLASS(wxControlWithItemsBase) + wxDECLARE_NO_COPY_CLASS(wxControlWithItemsBase); }; // define the platform-specific wxControlWithItems class @@ -453,7 +453,7 @@ private: private: DECLARE_ABSTRACT_CLASS(wxControlWithItems) - DECLARE_NO_COPY_CLASS(wxControlWithItems) + wxDECLARE_NO_COPY_CLASS(wxControlWithItems); }; #endif diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index ec7b0d76a4..7eb724f395 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -246,7 +246,7 @@ private: // the one and only format we support wxDataFormat m_format; - DECLARE_NO_COPY_CLASS(wxDataObjectSimple) + wxDECLARE_NO_COPY_CLASS(wxDataObjectSimple); }; // ---------------------------------------------------------------------------- @@ -309,7 +309,7 @@ private: wxDataFormat m_receivedFormat; - DECLARE_NO_COPY_CLASS(wxDataObjectComposite) + wxDECLARE_NO_COPY_CLASS(wxDataObjectComposite); }; // ============================================================================ @@ -393,7 +393,7 @@ public: private: wxString m_text; - DECLARE_NO_COPY_CLASS(wxTextDataObject) + wxDECLARE_NO_COPY_CLASS(wxTextDataObject); }; // ---------------------------------------------------------------------------- @@ -418,7 +418,7 @@ public: protected: wxBitmap m_bitmap; - DECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase) + wxDECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase); }; // ---------------------------------------------------------------------------- @@ -440,7 +440,7 @@ public: protected: wxArrayString m_filenames; - DECLARE_NO_COPY_CLASS(wxFileDataObjectBase) + wxDECLARE_NO_COPY_CLASS(wxFileDataObjectBase); }; // ---------------------------------------------------------------------------- @@ -501,7 +501,7 @@ private: size_t m_size; void *m_data; - DECLARE_NO_COPY_CLASS(wxCustomDataObject) + wxDECLARE_NO_COPY_CLASS(wxCustomDataObject); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h index d83aa66993..f379d8a5c6 100644 --- a/include/wx/datstrm.h +++ b/include/wx/datstrm.h @@ -91,7 +91,7 @@ protected: wxMBConv *m_conv; #endif - DECLARE_NO_COPY_CLASS(wxDataInputStream) + wxDECLARE_NO_COPY_CLASS(wxDataInputStream); }; class WXDLLIMPEXP_BASE wxDataOutputStream @@ -169,7 +169,7 @@ protected: wxMBConv *m_conv; #endif - DECLARE_NO_COPY_CLASS(wxDataOutputStream) + wxDECLARE_NO_COPY_CLASS(wxDataOutputStream); }; #endif diff --git a/include/wx/dc.h b/include/wx/dc.h index 1fd9da829b..f9fec15da9 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -1212,7 +1212,7 @@ protected: private: DECLARE_ABSTRACT_CLASS(wxDC) - DECLARE_NO_COPY_CLASS(wxDC) + wxDECLARE_NO_COPY_CLASS(wxDC); }; // ---------------------------------------------------------------------------- @@ -1248,7 +1248,7 @@ private: wxColour m_colFgOld; - DECLARE_NO_COPY_CLASS(wxDCTextColourChanger) + wxDECLARE_NO_COPY_CLASS(wxDCTextColourChanger); }; // ---------------------------------------------------------------------------- @@ -1275,7 +1275,7 @@ private: wxPen m_penOld; - DECLARE_NO_COPY_CLASS(wxDCPenChanger) + wxDECLARE_NO_COPY_CLASS(wxDCPenChanger); }; // ---------------------------------------------------------------------------- @@ -1302,7 +1302,7 @@ private: wxBrush m_brushOld; - DECLARE_NO_COPY_CLASS(wxDCBrushChanger) + wxDECLARE_NO_COPY_CLASS(wxDCBrushChanger); }; // ---------------------------------------------------------------------------- @@ -1325,7 +1325,7 @@ public: private: wxDC& m_dc; - DECLARE_NO_COPY_CLASS(wxDCClipper) + wxDECLARE_NO_COPY_CLASS(wxDCClipper); }; // ---------------------------------------------------------------------------- @@ -1352,7 +1352,7 @@ private: wxFont m_fontOld; - DECLARE_NO_COPY_CLASS(wxDCFontChanger) + wxDECLARE_NO_COPY_CLASS(wxDCFontChanger); }; diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h index 203f7cd1a3..991fdaad39 100644 --- a/include/wx/dcbuffer.h +++ b/include/wx/dcbuffer.h @@ -139,7 +139,7 @@ private: int m_style; DECLARE_DYNAMIC_CLASS(wxBufferedDC) - DECLARE_NO_COPY_CLASS(wxBufferedDC) + wxDECLARE_NO_COPY_CLASS(wxBufferedDC); }; @@ -199,7 +199,7 @@ private: wxPaintDC m_paintdc; DECLARE_ABSTRACT_CLASS(wxBufferedPaintDC) - DECLARE_NO_COPY_CLASS(wxBufferedPaintDC) + wxDECLARE_NO_COPY_CLASS(wxBufferedPaintDC); }; @@ -241,7 +241,7 @@ private: wxT("and also, if needed, paint the background manually in the paint event handler.")); } - DECLARE_NO_COPY_CLASS(wxAutoBufferedPaintDC) + wxDECLARE_NO_COPY_CLASS(wxAutoBufferedPaintDC); }; #else // !__WXDEBUG__ diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 0db43629ac..364d435894 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -36,7 +36,7 @@ public: void SetGraphicsContext( wxGraphicsContext* ctx ); DECLARE_DYNAMIC_CLASS(wxGCDC) - DECLARE_NO_COPY_CLASS(wxGCDC) + wxDECLARE_NO_COPY_CLASS(wxGCDC); }; @@ -197,7 +197,7 @@ protected: wxGraphicsContext* m_graphicContext; DECLARE_CLASS(wxGCDCImpl) - DECLARE_NO_COPY_CLASS(wxGCDCImpl) + wxDECLARE_NO_COPY_CLASS(wxGCDCImpl); }; #endif // wxUSE_GRAPHICS_CONTEXT diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h index a4c61c327a..d64f5004bc 100644 --- a/include/wx/dcmirror.h +++ b/include/wx/dcmirror.h @@ -273,7 +273,7 @@ private: bool m_mirror; - DECLARE_NO_COPY_CLASS(wxMirrorDCImpl) + wxDECLARE_NO_COPY_CLASS(wxMirrorDCImpl); }; class WXDLLIMPEXP_CORE wxMirrorDC : public wxDC @@ -294,7 +294,7 @@ public: private: bool m_mirror; - DECLARE_NO_COPY_CLASS(wxMirrorDC) + wxDECLARE_NO_COPY_CLASS(wxMirrorDC); }; #endif // _WX_DCMIRROR_H_ diff --git a/include/wx/defs.h b/include/wx/defs.h index 020ceade94..835eeae759 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -3121,22 +3121,30 @@ typedef const void* WXWidget; #include "wx/features.h" /* --------------------------------------------------------------------------- */ -/* macro to define a class without copy ctor nor assignment operator */ +/* macros to define a class without copy ctor nor assignment operator */ /* --------------------------------------------------------------------------- */ -#define DECLARE_NO_COPY_CLASS(classname) \ +#define wxDECLARE_NO_COPY_CLASS(classname) \ private: \ classname(const classname&); \ - classname& operator=(const classname&); + classname& operator=(const classname&) -#define DECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) \ - private: \ - classname(const classname&); \ - classname& operator=(const classname&); +#define wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) \ + private: \ + classname(const classname&); \ + classname& operator=(const classname&) -#define DECLARE_NO_ASSIGN_CLASS(classname) \ +#define wxDECLARE_NO_ASSIGN_CLASS(classname) \ private: \ - classname& operator=(const classname&); + classname& operator=(const classname&) + +// deprecated variants _not_ requiring a semicolon after them +#define DECLARE_NO_COPY_CLASS(classname) \ + wxDECLARE_NO_COPY_CLASS(classname); +#define DECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) \ + wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg); +#define DECLARE_NO_ASSIGN_CLASS(classname) \ + wxDECLARE_NO_ASSIGN_CLASS(classname); /* --------------------------------------------------------------------------- */ /* If a manifest is being automatically generated, add common controls 6 to it */ diff --git a/include/wx/dfb/dcclient.h b/include/wx/dfb/dcclient.h index 17ae7ed988..7559eb1b56 100644 --- a/include/wx/dfb/dcclient.h +++ b/include/wx/dfb/dcclient.h @@ -39,7 +39,7 @@ private: friend class wxOverlayImpl; // for m_shouldFlip; DECLARE_DYNAMIC_CLASS(wxWindowDCImpl) - DECLARE_NO_COPY_CLASS(wxWindowDCImpl) + wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); }; //----------------------------------------------------------------------------- @@ -53,7 +53,7 @@ public: wxClientDCImpl(wxDC *owner, wxWindow *win); DECLARE_DYNAMIC_CLASS(wxClientDCImpl) - DECLARE_NO_COPY_CLASS(wxClientDCImpl) + wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); }; @@ -68,7 +68,7 @@ public: wxPaintDCImpl(wxDC *owner, wxWindow *win) : wxClientDCImpl(owner, win) { } DECLARE_DYNAMIC_CLASS(wxPaintDCImpl) - DECLARE_NO_COPY_CLASS(wxPaintDCImpl) + wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); }; #endif // _WX_DFB_DCCLIENT_H_ diff --git a/include/wx/dfb/evtloop.h b/include/wx/dfb/evtloop.h index 9b010a1034..d6fa511ddc 100644 --- a/include/wx/dfb/evtloop.h +++ b/include/wx/dfb/evtloop.h @@ -42,7 +42,7 @@ private: static wxIDirectFBEventBufferPtr ms_buffer; static int ms_bufferFd; - DECLARE_NO_COPY_CLASS(wxGUIEventLoop) + wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); }; #endif // _WX_DFB_EVTLOOP_H_ diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h index d70774f9cc..b6b4c59c34 100644 --- a/include/wx/dfb/window.h +++ b/include/wx/dfb/window.h @@ -190,7 +190,7 @@ private: friend class wxWindowDCImpl; // for PaintOverlays DECLARE_DYNAMIC_CLASS(wxWindowDFB) - DECLARE_NO_COPY_CLASS(wxWindowDFB) + wxDECLARE_NO_COPY_CLASS(wxWindowDFB); DECLARE_EVENT_TABLE() }; diff --git a/include/wx/dialog.h b/include/wx/dialog.h index a8160033fd..36bcb643db 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -224,7 +224,7 @@ private: void OnSysColourChanged(wxSysColourChangedEvent& event); - DECLARE_NO_COPY_CLASS(wxDialogBase) + wxDECLARE_NO_COPY_CLASS(wxDialogBase); DECLARE_EVENT_TABLE() }; diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 848328c6ce..75c7c63085 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -180,7 +180,7 @@ public: virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); } private: - DECLARE_NO_ASSIGN_CLASS(wxDialUpEvent) + wxDECLARE_NO_ASSIGN_CLASS(wxDialUpEvent); }; // the type of dialup event handler function diff --git a/include/wx/dir.h b/include/wx/dir.h index 9a73c6644e..b7389f1708 100644 --- a/include/wx/dir.h +++ b/include/wx/dir.h @@ -156,7 +156,7 @@ private: wxDirData *m_data; - DECLARE_NO_COPY_CLASS(wxDir) + wxDECLARE_NO_COPY_CLASS(wxDir); }; #endif // _WX_DIR_H_ diff --git a/include/wx/display.h b/include/wx/display.h index 354b95d73c..7923e9c687 100644 --- a/include/wx/display.h +++ b/include/wx/display.h @@ -122,7 +122,7 @@ private: wxDisplayImpl *m_impl; - DECLARE_NO_COPY_CLASS(wxDisplay) + wxDECLARE_NO_COPY_CLASS(wxDisplay); }; #endif // _WX_DISPLAY_H_BASE_ diff --git a/include/wx/display_impl.h b/include/wx/display_impl.h index 015ffec466..95a9da8a7e 100644 --- a/include/wx/display_impl.h +++ b/include/wx/display_impl.h @@ -89,7 +89,7 @@ protected: friend class wxDisplayFactory; - DECLARE_NO_COPY_CLASS(wxDisplayImpl) + wxDECLARE_NO_COPY_CLASS(wxDisplayImpl); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/dnd.h b/include/wx/dnd.h index bacf91998e..ac3c9c4f84 100644 --- a/include/wx/dnd.h +++ b/include/wx/dnd.h @@ -115,7 +115,7 @@ protected: m_cursorMove, m_cursorStop; - DECLARE_NO_COPY_CLASS(wxDropSourceBase) + wxDECLARE_NO_COPY_CLASS(wxDropSourceBase); }; // ---------------------------------------------------------------------------- @@ -203,7 +203,7 @@ protected: wxDataObject *m_dataObject; wxDragResult m_defaultAction; - DECLARE_NO_COPY_CLASS(wxDropTargetBase) + wxDECLARE_NO_COPY_CLASS(wxDropTargetBase); }; // ---------------------------------------------------------------------------- @@ -243,7 +243,7 @@ public: virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); private: - DECLARE_NO_COPY_CLASS(wxTextDropTarget) + wxDECLARE_NO_COPY_CLASS(wxTextDropTarget); }; // A drop target which accepts files (dragged from File Manager or Explorer) @@ -259,7 +259,7 @@ public: virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); private: - DECLARE_NO_COPY_CLASS(wxFileDropTarget) + wxDECLARE_NO_COPY_CLASS(wxFileDropTarget); }; #endif // wxUSE_DRAG_AND_DROP diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index 828e6a5b6d..e105fdcd50 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -51,7 +51,7 @@ protected: private: DECLARE_CLASS(wxDocMDIParentFrame) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDocMDIParentFrame) + wxDECLARE_NO_COPY_CLASS(wxDocMDIParentFrame); }; /* @@ -97,7 +97,7 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_CLASS(wxDocMDIChildFrame) - DECLARE_NO_COPY_CLASS(wxDocMDIChildFrame) + wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame); }; #endif diff --git a/include/wx/docview.h b/include/wx/docview.h index a7c6df2620..821c7abc1c 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -190,7 +190,7 @@ protected: private: DECLARE_ABSTRACT_CLASS(wxDocument) - DECLARE_NO_COPY_CLASS(wxDocument) + wxDECLARE_NO_COPY_CLASS(wxDocument); }; class WXDLLIMPEXP_CORE wxView: public wxEvtHandler @@ -251,7 +251,7 @@ protected: private: DECLARE_ABSTRACT_CLASS(wxView) - DECLARE_NO_COPY_CLASS(wxView) + wxDECLARE_NO_COPY_CLASS(wxView); }; // Represents user interface (and other) properties of documents and views @@ -336,7 +336,7 @@ protected: private: DECLARE_CLASS(wxDocTemplate) - DECLARE_NO_COPY_CLASS(wxDocTemplate) + wxDECLARE_NO_COPY_CLASS(wxDocTemplate); }; // One object of this class may be created in an application, to manage all @@ -489,7 +489,7 @@ protected: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxDocManager) - DECLARE_NO_COPY_CLASS(wxDocManager) + wxDECLARE_NO_COPY_CLASS(wxDocManager); }; #if WXWIN_COMPATIBILITY_2_6 @@ -536,7 +536,7 @@ protected: private: DECLARE_CLASS(wxDocChildFrame) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDocChildFrame) + wxDECLARE_NO_COPY_CLASS(wxDocChildFrame); }; // ---------------------------------------------------------------------------- @@ -581,7 +581,7 @@ private: typedef wxFrame base_type; DECLARE_CLASS(wxDocParentFrame) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDocParentFrame) + wxDECLARE_NO_COPY_CLASS(wxDocParentFrame); }; // ---------------------------------------------------------------------------- @@ -608,7 +608,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxDocPrintout) - DECLARE_NO_COPY_CLASS(wxDocPrintout) + wxDECLARE_NO_COPY_CLASS(wxDocPrintout); }; #endif // wxUSE_PRINTING_ARCHITECTURE @@ -668,7 +668,7 @@ private: wxWindowID m_idBase; DECLARE_DYNAMIC_CLASS(wxFileHistory) - DECLARE_NO_COPY_CLASS(wxFileHistory) + wxDECLARE_NO_COPY_CLASS(wxFileHistory); }; #if WXWIN_COMPATIBILITY_2_6 diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index 24f1020b50..3ac5dfa24c 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -375,7 +375,7 @@ protected: // no copy ctor/assignment operators (or we'd try to unload the library // twice) - DECLARE_NO_COPY_CLASS(wxDynamicLibrary) + wxDECLARE_NO_COPY_CLASS(wxDynamicLibrary); }; #ifdef __WXMSW__ diff --git a/include/wx/dynload.h b/include/wx/dynload.h index d4c710d940..8b079d4630 100644 --- a/include/wx/dynload.h +++ b/include/wx/dynload.h @@ -94,7 +94,7 @@ private: void RegisterModules(); // Init any wxModules in the lib. void UnregisterModules(); // Cleanup any wxModules we installed. - DECLARE_NO_COPY_CLASS(wxPluginLibrary) + wxDECLARE_NO_COPY_CLASS(wxPluginLibrary); }; @@ -144,7 +144,7 @@ private: // We could allow this class to be copied if we really // wanted to, but not without modification. - DECLARE_NO_COPY_CLASS(wxPluginManager) + wxDECLARE_NO_COPY_CLASS(wxPluginManager); }; diff --git a/include/wx/encconv.h b/include/wx/encconv.h index 6a54439eeb..2c4bfa21e2 100644 --- a/include/wx/encconv.h +++ b/include/wx/encconv.h @@ -153,7 +153,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject bool m_UnicodeInput, m_UnicodeOutput; bool m_JustCopy; - DECLARE_NO_COPY_CLASS(wxEncodingConverter) + wxDECLARE_NO_COPY_CLASS(wxEncodingConverter); }; #endif // _WX_ENCCONV_H_ diff --git a/include/wx/event.h b/include/wx/event.h index c8d44ee30c..073fef666a 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -963,7 +963,7 @@ private: wxEvent& m_event; int m_propagationLevelOld; - DECLARE_NO_COPY_CLASS(wxPropagationDisabler) + wxDECLARE_NO_COPY_CLASS(wxPropagationDisabler); }; /* @@ -988,7 +988,7 @@ public: private: wxEvent& m_event; - DECLARE_NO_COPY_CLASS(wxPropagateOnce) + wxDECLARE_NO_COPY_CLASS(wxPropagateOnce); }; @@ -2723,7 +2723,7 @@ struct WXDLLIMPEXP_BASE wxEventTableEntryBase wxObject* m_callbackUserData; private: - DECLARE_NO_ASSIGN_CLASS(wxEventTableEntryBase) + wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntryBase); }; // an entry from a static event table @@ -2744,7 +2744,7 @@ struct WXDLLIMPEXP_BASE wxEventTableEntry : public wxEventTableEntryBase const int& m_eventType; private: - DECLARE_NO_ASSIGN_CLASS(wxEventTableEntry) + wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntry); }; // an entry used in dynamic event table managed by wxEvtHandler::Connect() @@ -2762,7 +2762,7 @@ struct WXDLLIMPEXP_BASE wxDynamicEventTableEntry : public wxEventTableEntryBase int m_eventType; private: - DECLARE_NO_ASSIGN_CLASS(wxDynamicEventTableEntry) + wxDECLARE_NO_ASSIGN_CLASS(wxDynamicEventTableEntry); }; // ---------------------------------------------------------------------------- @@ -2835,7 +2835,7 @@ protected: wxEventHashTable* m_previous; wxEventHashTable* m_next; - DECLARE_NO_COPY_CLASS(wxEventHashTable) + wxDECLARE_NO_COPY_CLASS(wxEventHashTable); }; // ---------------------------------------------------------------------------- @@ -3402,7 +3402,7 @@ private: friend class wxEvtHandler; - DECLARE_NO_ASSIGN_CLASS(wxEventConnectionRef) + wxDECLARE_NO_ASSIGN_CLASS(wxEventConnectionRef); }; // Post a message to the given event handler which will be processed during the @@ -3457,7 +3457,7 @@ protected: wxArrayInt m_eventsToBlock; wxWindow *m_window; - DECLARE_NO_COPY_CLASS(wxEventBlocker) + wxDECLARE_NO_COPY_CLASS(wxEventBlocker); }; typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&); diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 6841c61fd0..7d85458ff8 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -76,7 +76,7 @@ protected: // the pointer to currently active loop static wxEventLoopBase *ms_activeLoop; - DECLARE_NO_COPY_CLASS(wxEventLoopBase) + wxDECLARE_NO_COPY_CLASS(wxEventLoopBase); }; #if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__) || defined(__UNIX__) @@ -166,7 +166,7 @@ protected: // the pointer to the port specific implementation class wxEventLoopImpl *m_impl; - DECLARE_NO_COPY_CLASS(wxGUIEventLoop) + wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); }; #endif // platforms diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index 38673d0b3d..cbca13b294 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -121,7 +121,7 @@ protected: // the last string we searched for wxString m_lastSearch; - DECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase) + wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase); }; // include wxFindReplaceDialog declaration diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index 7edce41d04..c86af998c2 100644 --- a/include/wx/fileconf.h +++ b/include/wx/fileconf.h @@ -252,7 +252,7 @@ private: bool m_isDirty; // if true, we have unsaved changes - DECLARE_NO_COPY_CLASS(wxFileConfig) + wxDECLARE_NO_COPY_CLASS(wxFileConfig); DECLARE_ABSTRACT_CLASS(wxFileConfig) }; diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index fa69620acc..11e720f864 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -170,7 +170,7 @@ private: void Init(); DECLARE_DYNAMIC_CLASS(wxFileDialogBase) - DECLARE_NO_COPY_CLASS(wxFileDialogBase) + wxDECLARE_NO_COPY_CLASS(wxFileDialogBase); }; diff --git a/include/wx/filesys.h b/include/wx/filesys.h index 80f772c0b7..51f06fad21 100644 --- a/include/wx/filesys.h +++ b/include/wx/filesys.h @@ -99,7 +99,7 @@ private: #endif // wxUSE_DATETIME DECLARE_ABSTRACT_CLASS(wxFSFile) - DECLARE_NO_COPY_CLASS(wxFSFile) + wxDECLARE_NO_COPY_CLASS(wxFSFile); }; @@ -247,7 +247,7 @@ protected: // Handlers local to this instance DECLARE_DYNAMIC_CLASS(wxFileSystem) - DECLARE_NO_COPY_CLASS(wxFileSystem) + wxDECLARE_NO_COPY_CLASS(wxFileSystem); }; diff --git a/include/wx/fmappriv.h b/include/wx/fmappriv.h index 63924093ce..e1dc683106 100644 --- a/include/wx/fmappriv.h +++ b/include/wx/fmappriv.h @@ -65,7 +65,7 @@ private: bool m_ok; - DECLARE_NO_COPY_CLASS(wxFontMapperPathChanger) + wxDECLARE_NO_COPY_CLASS(wxFontMapperPathChanger); }; #endif // wxUSE_CONFIG diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h index 5a2dca1195..831d92409b 100644 --- a/include/wx/fontdlg.h +++ b/include/wx/fontdlg.h @@ -58,7 +58,7 @@ protected: wxFontData m_fontData; - DECLARE_NO_COPY_CLASS(wxFontDialogBase) + wxDECLARE_NO_COPY_CLASS(wxFontDialogBase); }; #if WXWIN_COMPATIBILITY_2_6 diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h index ca127b3c8a..051ee572c1 100644 --- a/include/wx/fontenum.h +++ b/include/wx/fontenum.h @@ -81,7 +81,7 @@ private: bool EnumerateEncodingsUTF8(const wxString& facename); #endif - DECLARE_NO_COPY_CLASS(wxFontEnumerator) + wxDECLARE_NO_COPY_CLASS(wxFontEnumerator); }; #endif // wxUSE_FONTENUM diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h index 3a260ce5a2..98a799a12b 100644 --- a/include/wx/fontmap.h +++ b/include/wx/fontmap.h @@ -170,7 +170,7 @@ private: friend class wxFontMapperPathChanger; - DECLARE_NO_COPY_CLASS(wxFontMapperBase) + wxDECLARE_NO_COPY_CLASS(wxFontMapperBase); }; // ---------------------------------------------------------------------------- @@ -264,7 +264,7 @@ protected: wxWindow *m_windowParent; private: - DECLARE_NO_COPY_CLASS(wxFontMapper) + wxDECLARE_NO_COPY_CLASS(wxFontMapper); }; #endif // wxUSE_GUI diff --git a/include/wx/frame.h b/include/wx/frame.h index 82588b26e3..1d1ab9655f 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -251,7 +251,7 @@ protected: DECLARE_EVENT_TABLE() #endif // wxUSE_MENUS && wxUSE_STATUSBAR - DECLARE_NO_COPY_CLASS(wxFrameBase) + wxDECLARE_NO_COPY_CLASS(wxFrameBase); }; // include the real class declaration diff --git a/include/wx/fs_arc.h b/include/wx/fs_arc.h index 53e83fa2ee..583a5104f6 100644 --- a/include/wx/fs_arc.h +++ b/include/wx/fs_arc.h @@ -47,7 +47,7 @@ private: wxString DoFind(); - DECLARE_NO_COPY_CLASS(wxArchiveFSHandler) + wxDECLARE_NO_COPY_CLASS(wxArchiveFSHandler); DECLARE_DYNAMIC_CLASS(wxArchiveFSHandler) }; diff --git a/include/wx/fs_filter.h b/include/wx/fs_filter.h index bd8924cc43..aa47cebb0b 100644 --- a/include/wx/fs_filter.h +++ b/include/wx/fs_filter.h @@ -33,7 +33,7 @@ public: virtual wxString FindNext(); private: - DECLARE_NO_COPY_CLASS(wxFilterFSHandler) + wxDECLARE_NO_COPY_CLASS(wxFilterFSHandler); }; #endif // wxUSE_FILESYSTEM diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 1e2bd61ca8..65660db109 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -100,7 +100,7 @@ protected: int m_nDirection; // can be wxRIGHT or wxLEFT #endif - DECLARE_NO_COPY_CLASS(wxGaugeBase) + wxDECLARE_NO_COPY_CLASS(wxGaugeBase); }; #if defined(__WXUNIVERSAL__) diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h index 3bfa9a1947..eaea7137b1 100644 --- a/include/wx/gbsizer.h +++ b/include/wx/gbsizer.h @@ -156,7 +156,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxGBSizerItem) - DECLARE_NO_COPY_CLASS(wxGBSizerItem) + wxDECLARE_NO_COPY_CLASS(wxGBSizerItem); }; @@ -294,7 +294,7 @@ protected: private: DECLARE_CLASS(wxGridBagSizer) - DECLARE_NO_COPY_CLASS(wxGridBagSizer) + wxDECLARE_NO_COPY_CLASS(wxGridBagSizer); }; //--------------------------------------------------------------------------- diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 4defdb538e..9072ef7230 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -812,7 +812,7 @@ protected: static wxObject* ms_stockObject[ITEMCOUNT]; - DECLARE_NO_COPY_CLASS(wxStockGDI) + wxDECLARE_NO_COPY_CLASS(wxStockGDI); }; #define wxITALIC_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_ITALIC) diff --git a/include/wx/generic/busyinfo.h b/include/wx/generic/busyinfo.h index a48067b175..b75204a2cd 100644 --- a/include/wx/generic/busyinfo.h +++ b/include/wx/generic/busyinfo.h @@ -33,7 +33,7 @@ public: private: wxFrame *m_InfoFrame; - DECLARE_NO_COPY_CLASS(wxBusyInfo) + wxDECLARE_NO_COPY_CLASS(wxBusyInfo); }; diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h index 9ff4e89b54..0e97ee0854 100644 --- a/include/wx/generic/calctrlg.h +++ b/include/wx/generic/calctrlg.h @@ -297,7 +297,7 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericCalendarCtrl) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxGenericCalendarCtrl) + wxDECLARE_NO_COPY_CLASS(wxGenericCalendarCtrl); }; #endif // _WX_GENERIC_CALCTRLG_H diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index e2f637305b..97b9a8949b 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -86,7 +86,7 @@ protected: const wxString *choices, long styleLbox); - DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog) + wxDECLARE_NO_COPY_CLASS(wxAnyChoiceDialog); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/generic/ctrlsub.h b/include/wx/generic/ctrlsub.h index c20c7e6253..1733342f90 100644 --- a/include/wx/generic/ctrlsub.h +++ b/include/wx/generic/ctrlsub.h @@ -116,7 +116,7 @@ private: return true; } - DECLARE_NO_COPY_CLASS(wxControlWithItemsGeneric) + wxDECLARE_NO_COPY_CLASS(wxControlWithItemsGeneric); }; #endif // _WX_GENERIC_CTRLSUB_H_ diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index 96419a64fb..bf698082e3 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -522,7 +522,7 @@ private: private: DECLARE_DYNAMIC_CLASS(wxDataViewCtrl) - DECLARE_NO_COPY_CLASS(wxDataViewCtrl) + wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl); DECLARE_EVENT_TABLE() }; diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h index 75172a2d44..28461eb130 100644 --- a/include/wx/generic/datectrl.h +++ b/include/wx/generic/datectrl.h @@ -81,7 +81,7 @@ private: wxCalendarComboPopup* m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric) + wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric); }; #endif // _WX_GENERIC_DATECTRL_H_ diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index bd09b3c8a6..7c0640be7d 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -199,7 +199,7 @@ private: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl) - DECLARE_NO_COPY_CLASS(wxGenericDirCtrl) + wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl); }; //----------------------------------------------------------------------------- @@ -239,7 +239,7 @@ protected: DECLARE_EVENT_TABLE() DECLARE_CLASS(wxDirFilterListCtrl) - DECLARE_NO_COPY_CLASS(wxDirFilterListCtrl) + wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl); }; #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__) diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h index 819128fd04..f37a9abcc1 100644 --- a/include/wx/generic/dragimgg.h +++ b/include/wx/generic/dragimgg.h @@ -265,7 +265,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxGenericDragImage) - DECLARE_NO_COPY_CLASS(wxGenericDragImage) + wxDECLARE_NO_COPY_CLASS(wxGenericDragImage); }; #endif diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index 43befd0172..cc23938ef4 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -281,7 +281,7 @@ protected: // no friends friend class wxGridCellEditorDummyFriend; - DECLARE_NO_COPY_CLASS(wxGridCellEditor) + wxDECLARE_NO_COPY_CLASS(wxGridCellEditor); }; @@ -435,7 +435,7 @@ private: wxAttrKind m_attrkind; // use Clone() instead - DECLARE_NO_COPY_CLASS(wxGridCellAttr) + wxDECLARE_NO_COPY_CLASS(wxGridCellAttr); // suppress the stupid gcc warning about the class having private dtor and // no friends @@ -480,7 +480,7 @@ private: wxGridCellAttrProviderData *m_data; - DECLARE_NO_COPY_CLASS(wxGridCellAttrProvider) + wxDECLARE_NO_COPY_CLASS(wxGridCellAttrProvider); }; // ---------------------------------------------------------------------------- @@ -649,7 +649,7 @@ private: wxGridCellAttrProvider *m_attrProvider; DECLARE_ABSTRACT_CLASS(wxGridTableBase) - DECLARE_NO_COPY_CLASS(wxGridTableBase) + wxDECLARE_NO_COPY_CLASS(wxGridTableBase); }; @@ -694,7 +694,7 @@ private: int m_comInt1; int m_comInt2; - DECLARE_NO_COPY_CLASS(wxGridTableMessage) + wxDECLARE_NO_COPY_CLASS(wxGridTableMessage); }; @@ -2039,7 +2039,7 @@ private: DECLARE_DYNAMIC_CLASS( wxGrid ) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxGrid) + wxDECLARE_NO_COPY_CLASS(wxGrid); }; // ---------------------------------------------------------------------------- @@ -2080,7 +2080,7 @@ private: wxGrid *m_grid; - DECLARE_NO_COPY_CLASS(wxGridUpdateLocker) + wxDECLARE_NO_COPY_CLASS(wxGridUpdateLocker); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/generic/grideditors.h b/include/wx/generic/grideditors.h index 073d62662b..a3a8d60c32 100644 --- a/include/wx/generic/grideditors.h +++ b/include/wx/generic/grideditors.h @@ -42,7 +42,7 @@ private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler) - DECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler) + wxDECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler); }; @@ -92,7 +92,7 @@ private: size_t m_maxChars; // max number of chars allowed wxString m_value; - DECLARE_NO_COPY_CLASS(wxGridCellTextEditor) + wxDECLARE_NO_COPY_CLASS(wxGridCellTextEditor); }; // the editor for numeric (long) data @@ -149,7 +149,7 @@ private: long m_value; - DECLARE_NO_COPY_CLASS(wxGridCellNumberEditor) + wxDECLARE_NO_COPY_CLASS(wxGridCellNumberEditor); }; // the editor for floating point numbers (double) data @@ -185,7 +185,7 @@ private: m_precision; double m_value; - DECLARE_NO_COPY_CLASS(wxGridCellFloatEditor) + wxDECLARE_NO_COPY_CLASS(wxGridCellFloatEditor); }; #endif // wxUSE_TEXTCTRL @@ -238,7 +238,7 @@ private: static wxString ms_stringValues[2]; - DECLARE_NO_COPY_CLASS(wxGridCellBoolEditor) + wxDECLARE_NO_COPY_CLASS(wxGridCellBoolEditor); }; #endif // wxUSE_CHECKBOX @@ -283,7 +283,7 @@ protected: wxArrayString m_choices; bool m_allowOthers; - DECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor) + wxDECLARE_NO_COPY_CLASS(wxGridCellChoiceEditor); }; #endif // wxUSE_COMBOBOX @@ -305,7 +305,7 @@ public: private: long m_index; - DECLARE_NO_COPY_CLASS(wxGridCellEnumEditor) + wxDECLARE_NO_COPY_CLASS(wxGridCellEnumEditor); }; #endif // wxUSE_COMBOBOX @@ -321,7 +321,7 @@ public: virtual wxGridCellEditor *Clone() const { return new wxGridCellAutoWrapStringEditor; } - DECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor) + wxDECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor); }; #endif // wxUSE_GRID diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h index 58dbddd1eb..f6d3a98c40 100644 --- a/include/wx/generic/gridsel.h +++ b/include/wx/generic/gridsel.h @@ -109,7 +109,7 @@ private: friend class WXDLLIMPEXP_FWD_ADV wxGrid; - DECLARE_NO_COPY_CLASS(wxGridSelection) + wxDECLARE_NO_COPY_CLASS(wxGridSelection); }; #endif // wxUSE_GRID diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h index 28a73c24b0..944bd43815 100644 --- a/include/wx/generic/headerctrlg.h +++ b/include/wx/generic/headerctrlg.h @@ -177,7 +177,7 @@ private: DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHeaderCtrl) + wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl); }; #endif // _WX_GENERIC_HEADERCTRLG_H_ diff --git a/include/wx/generic/logg.h b/include/wx/generic/logg.h index 269c65921a..83038d08b1 100644 --- a/include/wx/generic/logg.h +++ b/include/wx/generic/logg.h @@ -38,7 +38,7 @@ private: // the control we use wxTextCtrl *m_pTextCtrl; - DECLARE_NO_COPY_CLASS(wxLogTextCtrl) + wxDECLARE_NO_COPY_CLASS(wxLogTextCtrl); }; #endif // wxUSE_TEXTCTRL @@ -147,7 +147,7 @@ protected: private: wxLogFrame *m_pLogFrame; // the log frame - DECLARE_NO_COPY_CLASS(wxLogWindow) + wxDECLARE_NO_COPY_CLASS(wxLogWindow); }; #endif // wxUSE_LOGWINDOW diff --git a/include/wx/generic/notifmsg.h b/include/wx/generic/notifmsg.h index 15e1513db4..9f81e2b51f 100644 --- a/include/wx/generic/notifmsg.h +++ b/include/wx/generic/notifmsg.h @@ -54,7 +54,7 @@ private: wxNotificationMessageDialog *m_dialog; - DECLARE_NO_COPY_CLASS(wxGenericNotificationMessage) + wxDECLARE_NO_COPY_CLASS(wxGenericNotificationMessage); }; #endif // _WX_GENERIC_NOTIFMSG_H_ diff --git a/include/wx/generic/numdlgg.h b/include/wx/generic/numdlgg.h index 0ce35fb808..da413d2da7 100644 --- a/include/wx/generic/numdlgg.h +++ b/include/wx/generic/numdlgg.h @@ -57,7 +57,7 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxNumberEntryDialog) - DECLARE_NO_COPY_CLASS(wxNumberEntryDialog) + wxDECLARE_NO_COPY_CLASS(wxNumberEntryDialog); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h index e2ed4757d8..85509d521f 100644 --- a/include/wx/generic/private/grid.h +++ b/include/wx/generic/private/grid.h @@ -244,7 +244,7 @@ private: wxVector m_columns; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxGridHeaderCtrl) + wxDECLARE_NO_COPY_CLASS(wxGridHeaderCtrl); }; // common base class for various grid subwindows @@ -272,7 +272,7 @@ protected: wxGrid *m_owner; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxGridSubwindow) + wxDECLARE_NO_COPY_CLASS(wxGridSubwindow); }; class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow @@ -290,7 +290,7 @@ private: void OnMouseWheel( wxMouseEvent& event ); DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxGridRowLabelWindow) + wxDECLARE_NO_COPY_CLASS(wxGridRowLabelWindow); }; @@ -309,7 +309,7 @@ private: void OnMouseWheel( wxMouseEvent& event ); DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxGridColLabelWindow) + wxDECLARE_NO_COPY_CLASS(wxGridColLabelWindow); }; @@ -327,7 +327,7 @@ private: void OnPaint( wxPaintEvent& event ); DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow) + wxDECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow); }; class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow @@ -356,7 +356,7 @@ private: void OnFocus( wxFocusEvent& ); DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxGridWindow) + wxDECLARE_NO_COPY_CLASS(wxGridWindow); }; // ---------------------------------------------------------------------------- @@ -785,7 +785,7 @@ struct wxGridDataTypeInfo wxGridCellRenderer* m_renderer; wxGridCellEditor* m_editor; - DECLARE_NO_COPY_CLASS(wxGridDataTypeInfo) + wxDECLARE_NO_COPY_CLASS(wxGridDataTypeInfo); }; diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index aa0de14272..cf148f8d02 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -168,7 +168,7 @@ private: class WXDLLIMPEXP_FWD_CORE wxWindowDisabler *m_winDisabler; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxProgressDialog) + wxDECLARE_NO_COPY_CLASS(wxProgressDialog); }; #endif // wxUSE_PROGRESSDLG diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index 480c01ed25..cbc56178db 100644 --- a/include/wx/generic/sashwin.h +++ b/include/wx/generic/sashwin.h @@ -200,7 +200,7 @@ private: private: DECLARE_DYNAMIC_CLASS(wxSashWindow) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSashWindow) + wxDECLARE_NO_COPY_CLASS(wxSashWindow); }; class WXDLLIMPEXP_FWD_ADV wxSashEvent; diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index 615aeab40e..c4f4a0b292 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -46,7 +46,7 @@ private: wxScrollbarVisibility m_xVisibility, m_yVisibility; - DECLARE_NO_COPY_CLASS(wxScrollHelper) + wxDECLARE_NO_COPY_CLASS(wxScrollHelper); }; #endif // _WX_GENERIC_SCROLLWIN_H_ diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index 69d413c4e7..b23e3ea1d5 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -60,7 +60,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxSplashScreen) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplashScreen) + wxDECLARE_NO_COPY_CLASS(wxSplashScreen); }; /* @@ -84,7 +84,7 @@ protected: wxBitmap m_bitmap; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplashScreenWindow) + wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow); }; diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index b96cf67867..0cf27db3bf 100644 --- a/include/wx/generic/splitter.h +++ b/include/wx/generic/splitter.h @@ -301,7 +301,7 @@ private: DECLARE_DYNAMIC_CLASS(wxSplitterWindow) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSplitterWindow) + wxDECLARE_NO_COPY_CLASS(wxSplitterWindow); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h index d9bdbdcfb7..fab6bfeaf4 100644 --- a/include/wx/generic/textdlgg.h +++ b/include/wx/generic/textdlgg.h @@ -68,7 +68,7 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxTextEntryDialog) - DECLARE_NO_COPY_CLASS(wxTextEntryDialog) + wxDECLARE_NO_COPY_CLASS(wxTextEntryDialog); }; // ---------------------------------------------------------------------------- @@ -86,7 +86,7 @@ public: const wxPoint& pos = wxDefaultPosition); private: DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog) - DECLARE_NO_COPY_CLASS(wxPasswordEntryDialog) + wxDECLARE_NO_COPY_CLASS(wxPasswordEntryDialog); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index 486233ad7c..71dea9fc13 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -348,7 +348,7 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl) - DECLARE_NO_COPY_CLASS(wxGenericTreeCtrl) + wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl); }; #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h index 49f7dd06f5..43e210c5ad 100644 --- a/include/wx/generic/wizard.h +++ b/include/wx/generic/wizard.h @@ -163,7 +163,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxWizard) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxWizard) + wxDECLARE_NO_COPY_CLASS(wxWizard); }; #endif // _WX_GENERIC_WIZARD_H_ diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h index 86abb16cd6..443af47c8b 100644 --- a/include/wx/gifdecod.h +++ b/include/wx/gifdecod.h @@ -102,7 +102,7 @@ private: wxGIFErrorCode dgif(wxInputStream& stream, GIFImage *img, int interl, int bits); - DECLARE_NO_COPY_CLASS(wxGIFDecoder) + wxDECLARE_NO_COPY_CLASS(wxGIFDecoder); }; #endif // wxUSE_STREAMS && wxUSE_GIF diff --git a/include/wx/graphics.h b/include/wx/graphics.h index a00468f6ca..cd7ed7fcf0 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -512,7 +512,7 @@ protected: wxDouble angle, const wxGraphicsBrush& backgroundBrush); - DECLARE_NO_COPY_CLASS(wxGraphicsContext) + wxDECLARE_NO_COPY_CLASS(wxGraphicsContext); DECLARE_ABSTRACT_CLASS(wxGraphicsContext) }; @@ -620,7 +620,7 @@ public: private: - DECLARE_NO_COPY_CLASS(wxGraphicsRenderer) + wxDECLARE_NO_COPY_CLASS(wxGraphicsRenderer); DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer) }; diff --git a/include/wx/gtk/calctrl.h b/include/wx/gtk/calctrl.h index 764bf6a069..e9afdfec17 100644 --- a/include/wx/gtk/calctrl.h +++ b/include/wx/gtk/calctrl.h @@ -48,7 +48,7 @@ public: private: DECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl) - DECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl) + wxDECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl); }; #endif // GTK_CALCTRL_H__ diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h index f08f50f26d..d197acaf36 100644 --- a/include/wx/gtk/dataview.h +++ b/include/wx/gtk/dataview.h @@ -463,7 +463,7 @@ private: void GtkDisableSelectionEvents(); DECLARE_DYNAMIC_CLASS(wxDataViewCtrl) - DECLARE_NO_COPY_CLASS(wxDataViewCtrl) + wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl); }; diff --git a/include/wx/gtk/evtloop.h b/include/wx/gtk/evtloop.h index b47e187487..d19cd557c1 100644 --- a/include/wx/gtk/evtloop.h +++ b/include/wx/gtk/evtloop.h @@ -31,7 +31,7 @@ protected: // the exit code of this event loop int m_exitcode; - DECLARE_NO_COPY_CLASS(wxGUIEventLoop) + wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); }; #endif // _WX_GTK_EVTLOOP_H_ diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h index 7458e01e4e..182b5e316b 100644 --- a/include/wx/gtk/gnome/gprint.h +++ b/include/wx/gtk/gnome/gprint.h @@ -204,7 +204,7 @@ private: private: DECLARE_DYNAMIC_CLASS(wxGnomePrinter) - DECLARE_NO_COPY_CLASS(wxGnomePrinter) + wxDECLARE_NO_COPY_CLASS(wxGnomePrinter); }; //----------------------------------------------------------------------------- @@ -313,7 +313,7 @@ private: private: DECLARE_DYNAMIC_CLASS(wxGnomePrinterDCImpl) - DECLARE_NO_COPY_CLASS(wxGnomePrinterDCImpl) + wxDECLARE_NO_COPY_CLASS(wxGnomePrinterDCImpl); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/gtk/hildon/notifmsg.h b/include/wx/gtk/hildon/notifmsg.h index 5f3b5504f7..faca953d26 100644 --- a/include/wx/gtk/hildon/notifmsg.h +++ b/include/wx/gtk/hildon/notifmsg.h @@ -52,7 +52,7 @@ private: GtkWidget *m_banner; - DECLARE_NO_COPY_CLASS(wxNotificationMessage) + wxDECLARE_NO_COPY_CLASS(wxNotificationMessage); }; #endif // _WX_GTK_HILDON_NOTIFMSG_H_ diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h index 795cf71ccf..0082aa12db 100644 --- a/include/wx/gtk/print.h +++ b/include/wx/gtk/print.h @@ -174,7 +174,7 @@ private: wxDC *m_dc; DECLARE_DYNAMIC_CLASS(wxGtkPrinter) - DECLARE_NO_COPY_CLASS(wxGtkPrinter) + wxDECLARE_NO_COPY_CLASS(wxGtkPrinter); }; //---------------------------------------------------------------------------- @@ -315,7 +315,7 @@ private: double m_DEV2PS; DECLARE_DYNAMIC_CLASS(wxGtkPrinterDCImpl) - DECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl) + wxDECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/gtk/private/object.h b/include/wx/gtk/private/object.h index 404dc08129..f007371977 100644 --- a/include/wx/gtk/private/object.h +++ b/include/wx/gtk/private/object.h @@ -29,7 +29,7 @@ private: // copying could be implemented by using g_object_ref() but for now there // is no need for it so don't implement it - DECLARE_NO_COPY_CLASS(wxGtkObject) + wxDECLARE_NO_COPY_CLASS(wxGtkObject); }; #endif // _WX_GTK_PRIVATE_OBJECT_H_ diff --git a/include/wx/gtk/private/string.h b/include/wx/gtk/private/string.h index d6ef553132..a537667166 100644 --- a/include/wx/gtk/private/string.h +++ b/include/wx/gtk/private/string.h @@ -28,7 +28,7 @@ public: private: gchar *m_str; - DECLARE_NO_COPY_CLASS(wxGtkString) + wxDECLARE_NO_COPY_CLASS(wxGtkString); }; #endif // _WX_GTK_PRIVATE_STRING_H_ diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index f95ef798e2..88cbc2494e 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -71,7 +71,7 @@ private: int *posOld); private: - DECLARE_NO_COPY_CLASS(wxScrollHelper) + wxDECLARE_NO_COPY_CLASS(wxScrollHelper); }; #endif // _WX_GTK_SCROLLWIN_H_ diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 9a47beab7b..9f6a26f437 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -380,7 +380,7 @@ private: DECLARE_DYNAMIC_CLASS(wxWindowGTK) - DECLARE_NO_COPY_CLASS(wxWindowGTK) + wxDECLARE_NO_COPY_CLASS(wxWindowGTK); }; #endif // _WX_GTK_WINDOW_H_ diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h index d89c5b61c9..1447788a72 100644 --- a/include/wx/gtk1/scrolwin.h +++ b/include/wx/gtk1/scrolwin.h @@ -50,7 +50,7 @@ protected: int *posOld); private: - DECLARE_NO_COPY_CLASS(wxScrollHelper) + wxDECLARE_NO_COPY_CLASS(wxScrollHelper); }; #endif // _WX_GTK_SCROLLWIN_H_ diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 65c965d13e..0f5f08f3cd 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -264,7 +264,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxWindowGTK) - DECLARE_NO_COPY_CLASS(wxWindowGTK) + wxDECLARE_NO_COPY_CLASS(wxWindowGTK); }; extern WXDLLIMPEXP_CORE wxWindow *wxFindFocusedChild(wxWindowGTK *win); diff --git a/include/wx/hash.h b/include/wx/hash.h index 3eb539e9d3..43e9d957e4 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -150,7 +150,7 @@ protected: bool m_deleteContents; private: - DECLARE_NO_COPY_CLASS(wxHashTableBase) + wxDECLARE_NO_COPY_CLASS(wxHashTableBase); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 19ad3fdb49..325c072196 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -77,7 +77,7 @@ struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase _wxHashTable_NodeBase* m_next; // Cannot do this: -// DECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase) +// wxDECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase); // without rewriting the macros, which require a public copy constructor. }; diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h index 3118ee99cb..2d36093efc 100644 --- a/include/wx/headerctrl.h +++ b/include/wx/headerctrl.h @@ -361,7 +361,7 @@ private: unsigned int m_sortKey; - DECLARE_NO_COPY_CLASS(wxHeaderCtrlSimple) + wxDECLARE_NO_COPY_CLASS(wxHeaderCtrlSimple); }; // ---------------------------------------------------------------------------- diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h index 15328a0ad1..bea8657751 100644 --- a/include/wx/html/helpctrl.h +++ b/include/wx/html/helpctrl.h @@ -125,7 +125,7 @@ protected: wxHtmlHelpFrame* m_helpFrame; wxHtmlHelpDialog* m_helpDialog; - DECLARE_NO_COPY_CLASS(wxHtmlHelpController) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpController); }; /* diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index 320235a446..bafab9ecd5 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -122,7 +122,7 @@ private: bool m_CaseSensitive; bool m_WholeWords; - DECLARE_NO_COPY_CLASS(wxHtmlSearchEngine) + wxDECLARE_NO_COPY_CLASS(wxHtmlSearchEngine); }; @@ -157,7 +157,7 @@ private: int m_MaxIndex; // number of files we search // For progress bar: 100*curindex/maxindex = % complete - DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus) + wxDECLARE_NO_COPY_CLASS(wxHtmlSearchStatus); }; class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject @@ -215,7 +215,7 @@ protected: // Writes binary book bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f); - DECLARE_NO_COPY_CLASS(wxHtmlHelpData) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpData); }; #endif diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h index bca72de3ce..578c2c782d 100644 --- a/include/wx/html/helpdlg.h +++ b/include/wx/html/helpdlg.h @@ -81,7 +81,7 @@ protected: wxHtmlHelpController* m_helpController; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHtmlHelpDialog) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog); }; #endif diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index c9bae539a0..4bdbbc708d 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -139,7 +139,7 @@ protected: private: DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpFrame); }; #endif // wxUSE_WXHTML_HELP diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h index fe5d3aa6dd..42f05b5dc0 100644 --- a/include/wx/html/helpwnd.h +++ b/include/wx/html/helpwnd.h @@ -259,7 +259,7 @@ private: wxHtmlHelpMergedIndex *m_mergedIndex; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHtmlHelpWindow) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindow); }; /*! diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index df6dfa709a..3e1f9a44af 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -352,7 +352,7 @@ protected: wxString m_id; DECLARE_ABSTRACT_CLASS(wxHtmlCell) - DECLARE_NO_COPY_CLASS(wxHtmlCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlCell); }; @@ -395,7 +395,7 @@ protected: bool m_allowLinebreak; DECLARE_ABSTRACT_CLASS(wxHtmlWordCell) - DECLARE_NO_COPY_CLASS(wxHtmlWordCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlWordCell); }; @@ -540,7 +540,7 @@ protected: DECLARE_ABSTRACT_CLASS(wxHtmlContainerCell) - DECLARE_NO_COPY_CLASS(wxHtmlContainerCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlContainerCell); }; @@ -564,7 +564,7 @@ protected: unsigned m_Flags; DECLARE_ABSTRACT_CLASS(wxHtmlColourCell) - DECLARE_NO_COPY_CLASS(wxHtmlColourCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlColourCell); }; @@ -588,7 +588,7 @@ protected: wxFont m_Font; DECLARE_ABSTRACT_CLASS(wxHtmlFontCell) - DECLARE_NO_COPY_CLASS(wxHtmlFontCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlFontCell); }; @@ -624,7 +624,7 @@ protected: // width float is used in adjustWidth (it is in percents) DECLARE_ABSTRACT_CLASS(wxHtmlWidgetCell) - DECLARE_NO_COPY_CLASS(wxHtmlWidgetCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlWidgetCell); }; diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h index 92dc1be575..f4df4344dd 100644 --- a/include/wx/html/htmlpars.h +++ b/include/wx/html/htmlpars.h @@ -191,7 +191,7 @@ protected: wxHtmlTagHandlersSet m_HandlersSet; wxHtmlTagHandlersHash m_HandlersHash; - DECLARE_NO_COPY_CLASS(wxHtmlParser) + wxDECLARE_NO_COPY_CLASS(wxHtmlParser); // class for opening files (file system) wxFileSystem *m_FS; @@ -254,7 +254,7 @@ protected: wxHtmlParser *m_Parser; - DECLARE_NO_COPY_CLASS(wxHtmlTagHandler) + wxDECLARE_NO_COPY_CLASS(wxHtmlTagHandler); }; @@ -292,7 +292,7 @@ protected: wxFontEncoding m_encoding; #endif - DECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser) + wxDECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser); }; diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 3853333866..46f724cc78 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -47,7 +47,7 @@ public: wxString::const_iterator *end2, bool *hasEnding); - DECLARE_NO_COPY_CLASS(wxHtmlTagsCache) + wxDECLARE_NO_COPY_CLASS(wxHtmlTagsCache); }; @@ -154,7 +154,7 @@ private: wxHtmlTag *m_FirstChild, *m_LastChild; wxHtmlTag *m_Parent; - DECLARE_NO_COPY_CLASS(wxHtmlTag) + wxDECLARE_NO_COPY_CLASS(wxHtmlTag); }; diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index f9a87235e1..45d55c55bb 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -548,7 +548,7 @@ private: static wxCursor *ms_cursorText; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHtmlWindow) + wxDECLARE_NO_COPY_CLASS(wxHtmlWindow); }; class WXDLLIMPEXP_FWD_HTML wxHtmlCellEvent; diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h index 1598718cc4..aaa359e64a 100644 --- a/include/wx/html/htmprint.h +++ b/include/wx/html/htmprint.h @@ -91,7 +91,7 @@ private: wxHtmlContainerCell *m_Cells; int m_MaxWidth, m_Width, m_Height; - DECLARE_NO_COPY_CLASS(wxHtmlDCRenderer) + wxDECLARE_NO_COPY_CLASS(wxHtmlDCRenderer); }; @@ -194,7 +194,7 @@ private: // list of HTML filters static wxList m_Filters; - DECLARE_NO_COPY_CLASS(wxHtmlPrintout) + wxDECLARE_NO_COPY_CLASS(wxHtmlPrintout); }; @@ -284,7 +284,7 @@ private: wxString m_Headers[2], m_Footers[2]; wxWindow *m_ParentWindow; - DECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting) + wxDECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting); }; diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 5835338889..0c9d548c32 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -230,7 +230,7 @@ private: // expand TABs; only updated while inside 
     int m_posColumn;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlWinParser);
 };
 
 
@@ -257,7 +257,7 @@ public:
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
 
-    DECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler);
 };
 
 
diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 22f453c83c..45a1765b58 100644
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -185,7 +185,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxHtmlListBox)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlListBox);
 };
 
 
@@ -317,7 +317,7 @@ protected:
     // not be named m_clientdata as that clashes with the name of an
     // anonymous struct member in wxEvtHandler, which we derive from.
 
-    DECLARE_NO_COPY_CLASS(wxSimpleHtmlListBox)
+    wxDECLARE_NO_COPY_CLASS(wxSimpleHtmlListBox);
 };
 
 #endif // _WX_HTMLLBOX_H_
diff --git a/include/wx/intl.h b/include/wx/intl.h
index cead030884..d0b2af9d18 100644
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -576,7 +576,7 @@ private:
 
     static wxLanguageInfoArray *ms_languagesDB;
 
-    DECLARE_NO_COPY_CLASS(wxLocale)
+    wxDECLARE_NO_COPY_CLASS(wxLocale);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index ae4bbca0a6..7619671f10 100644
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -222,7 +222,7 @@ private:
 protected:
   bool          m_connected;
 
-  DECLARE_NO_ASSIGN_CLASS(wxConnectionBase)
+  wxDECLARE_NO_ASSIGN_CLASS(wxConnectionBase);
   DECLARE_CLASS(wxConnectionBase)
 };
 
diff --git a/include/wx/list.h b/include/wx/list.h
index 51ecad7972..b8cc07ea84 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -468,7 +468,7 @@ private:
 
     wxListBase  *m_list;        // list we belong to
 
-    DECLARE_NO_COPY_CLASS(wxNodeBase)
+    wxDECLARE_NO_COPY_CLASS(wxNodeBase);
 };
 
 // -----------------------------------------------------------------------------
diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index fa924a53c4..cc15c6764e 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -111,7 +111,7 @@ protected:
         { return wxNOT_FOUND; }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxListBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxListBoxBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/log.h b/include/wx/log.h
index aa8a00e216..cfe6b679e4 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -369,7 +369,7 @@ protected:
 private:
     wxString m_str;
 
-    DECLARE_NO_COPY_CLASS(wxLogBuffer)
+    wxDECLARE_NO_COPY_CLASS(wxLogBuffer);
 };
 
 
@@ -388,7 +388,7 @@ protected:
 
     FILE *m_fp;
 
-    DECLARE_NO_COPY_CLASS(wxLogStderr)
+    wxDECLARE_NO_COPY_CLASS(wxLogStderr);
 };
 
 #if wxUSE_STD_IOSTREAM
@@ -492,7 +492,7 @@ private:
     // do we pass the messages to the old logger?
     bool m_bPassMessages;
 
-    DECLARE_NO_COPY_CLASS(wxLogChain)
+    wxDECLARE_NO_COPY_CLASS(wxLogChain);
 };
 
 // a chain log target which uses itself as the new logger
@@ -505,7 +505,7 @@ public:
     wxLogInterposer();
 
 private:
-    DECLARE_NO_COPY_CLASS(wxLogInterposer)
+    wxDECLARE_NO_COPY_CLASS(wxLogInterposer);
 };
 
 // a temporary interposer which doesn't destroy the old log target
@@ -517,7 +517,7 @@ public:
     wxLogInterposerTemp();
 
 private:
-    DECLARE_NO_COPY_CLASS(wxLogInterposerTemp)
+    wxDECLARE_NO_COPY_CLASS(wxLogInterposerTemp);
 };
 
 #if wxUSE_GUI
diff --git a/include/wx/memconf.h b/include/wx/memconf.h
index 2b06e8983d..2fdfde9b19 100644
--- a/include/wx/memconf.h
+++ b/include/wx/memconf.h
@@ -46,7 +46,7 @@ public:
     {
     }
 
-    DECLARE_NO_COPY_CLASS(wxMemoryConfig)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryConfig);
 };
 
 #endif // wxUSE_CONFIG
diff --git a/include/wx/memtext.h b/include/wx/memtext.h
index 23b7de18d3..475e8fdc23 100644
--- a/include/wx/memtext.h
+++ b/include/wx/memtext.h
@@ -45,7 +45,7 @@ protected:
         { return true; }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxMemoryText)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryText);
 };
 
 #endif // wxUSE_TEXTBUFFER
diff --git a/include/wx/menu.h b/include/wx/menu.h
index 1280ea647e..4fc2b26f9d 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -377,7 +377,7 @@ protected:
 
     static bool      ms_locked;
 
-    DECLARE_NO_COPY_CLASS(wxMenuBase)
+    wxDECLARE_NO_COPY_CLASS(wxMenuBase);
 };
 
 // ----------------------------------------------------------------------------
@@ -509,7 +509,7 @@ protected:
     // the frame we are attached to (may be NULL)
     wxFrame *m_menuBarFrame;
 
-    DECLARE_NO_COPY_CLASS(wxMenuBarBase)
+    wxDECLARE_NO_COPY_CLASS(wxMenuBarBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index f89bfe3bc5..409197a61e 100644
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -139,7 +139,7 @@ private:
     friend class wxPaintDC;
 
     DECLARE_DYNAMIC_CLASS(wxWindowMGL)
-    DECLARE_NO_COPY_CLASS(wxWindowMGL)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMGL);
     DECLARE_EVENT_TABLE()
 
 public:
diff --git a/include/wx/motif/ctrlsub.h b/include/wx/motif/ctrlsub.h
index cc417f9f80..fef8e0a791 100644
--- a/include/wx/motif/ctrlsub.h
+++ b/include/wx/motif/ctrlsub.h
@@ -33,7 +33,7 @@ protected:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxControlWithItems)
-    DECLARE_NO_COPY_CLASS(wxControlWithItems)
+    wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
 };
 
 #endif // _WX_MOTIF_CTRLSUB_H_
diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index 12760abecb..5cdb389309 100644
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -303,7 +303,7 @@ private:
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindow)
-    DECLARE_NO_COPY_CLASS(wxWindow)
+    wxDECLARE_NO_COPY_CLASS(wxWindow);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 8645691499..7c4329fa39 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -186,7 +186,7 @@ protected:
              m_caption;
     long m_dialogStyle;
 
-    DECLARE_NO_COPY_CLASS(wxMessageDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialogBase);
 };
 
 // this is a helper class for native wxMessageDialog implementations which need
@@ -290,7 +290,7 @@ private:
              m_ok,
              m_cancel;
 
-    DECLARE_NO_COPY_CLASS(wxMessageDialogWithCustomLabels)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialogWithCustomLabels);
 };
 
 #endif // ports needing wxMessageDialogWithCustomLabels
diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index eb5e729ad5..8e12d63274 100644
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -65,7 +65,7 @@ private:
 
     // copy ctor is implemented above: it copies the other stream in this one
     DECLARE_ABSTRACT_CLASS(wxMemoryInputStream)
-    DECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream)
+    wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream);
 };
 
 class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream
@@ -95,7 +95,7 @@ protected:
     wxFileOffset OnSysTell() const;
 
     DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)
-    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream);
 };
 
 #if WXWIN_COMPATIBILITY_2_6
diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index d7175118e1..ade87d8c30 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -104,7 +104,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);
     DECLARE_DYNAMIC_CLASS(wxApp)
 };
 
diff --git a/include/wx/msw/calctrl.h b/include/wx/msw/calctrl.h
index d27875cf06..28384e212f 100644
--- a/include/wx/msw/calctrl.h
+++ b/include/wx/msw/calctrl.h
@@ -93,7 +93,7 @@ private:
 
 
     DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
-    DECLARE_NO_COPY_CLASS(wxCalendarCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxCalendarCtrl);
 };
 
 #endif // _WX_MSW_CALCTRL_H_
diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h
index 4a6d28ce83..d6468eb5b6 100644
--- a/include/wx/msw/caret.h
+++ b/include/wx/msw/caret.h
@@ -56,7 +56,7 @@ protected:
 private:
     bool m_hasCaret;
 
-    DECLARE_NO_COPY_CLASS(wxCaret)
+    wxDECLARE_NO_COPY_CLASS(wxCaret);
 };
 
 #endif // _WX_CARET_H_
diff --git a/include/wx/msw/ctrlsub.h b/include/wx/msw/ctrlsub.h
index 00c45349e7..9e3780cbfe 100644
--- a/include/wx/msw/ctrlsub.h
+++ b/include/wx/msw/ctrlsub.h
@@ -36,7 +36,7 @@ protected:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxControlWithItems)
-    DECLARE_NO_COPY_CLASS(wxControlWithItems)
+    wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
 };
 
 #endif // _WX_MSW_CTRLSUB_H_
diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 908e24bcff..0622448279 100644
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -310,7 +310,7 @@ protected:
 #endif
 
     DECLARE_CLASS(wxMSWDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMSWDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMSWDCImpl);
 };
 
 // ----------------------------------------------------------------------------
@@ -351,7 +351,7 @@ private:
     // find it ourselves
     const wxSize m_size;
 
-    DECLARE_NO_COPY_CLASS(wxDCTempImpl)
+    wxDECLARE_NO_COPY_CLASS(wxDCTempImpl);
 };
 
 class WXDLLIMPEXP_CORE wxDCTemp : public wxDC
diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index eed5e21e59..166ace2792 100644
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -50,7 +50,7 @@ protected:
     void InitDC();
 
     DECLARE_CLASS(wxWindowDCImpl)
-    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
@@ -70,7 +70,7 @@ protected:
     void InitDC();
 
     DECLARE_CLASS(wxClientDCImpl)
-    DECLARE_NO_COPY_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
@@ -93,7 +93,7 @@ protected:
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
     DECLARE_CLASS(wxPaintDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
 };
 
 /*
@@ -108,7 +108,7 @@ public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
     
     DECLARE_CLASS(wxPaintDCEx)
-    DECLARE_NO_COPY_CLASS(wxPaintDCEx)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
 };
 
 #endif
diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 5b78fead33..49c5475de2 100644
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -38,7 +38,7 @@ protected:
     void Init();
 
     DECLARE_CLASS(wxMemoryDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 
 #endif
diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index ee442eddd1..9d98518299 100644
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -58,7 +58,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxPrinterDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPrinterDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
 };
 
 // Gets an HDC for the specified printer configuration
diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index 8635b18afd..8d64f32bf3 100644
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -27,7 +27,7 @@ public:
     }
 
     DECLARE_CLASS(wxScreenDCImpl)
-    DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 
 #endif // _WX_MSW_DCSCREEN_H_
diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h
index 9cc5cca987..b05a4b4fbe 100644
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -73,7 +73,7 @@ public:
   int           m_dataSize;
   wxIPCFormat   m_dataType;
 
-  DECLARE_NO_COPY_CLASS(wxDDEConnection)
+  wxDECLARE_NO_COPY_CLASS(wxDDEConnection);
   DECLARE_DYNAMIC_CLASS(wxDDEConnection)
 };
 
diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 98b19aec79..02afe5be8a 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -131,7 +131,7 @@ private:
     WXHWND m_hGripper;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);
 };
 
 #endif
diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index 80d27e77d4..da33ac0795 100644
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -266,7 +266,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
-    DECLARE_NO_COPY_CLASS(wxDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxDragImage);
 };
 
 #endif // wxUSE_DRAGIMAGE
diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h
index b69aa33736..950b061e81 100644
--- a/include/wx/msw/enhmeta.h
+++ b/include/wx/msw/enhmeta.h
@@ -129,7 +129,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject);
 };
 
 
@@ -172,7 +172,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);
 };
 
 #endif // wxUSE_DRAG_AND_DROP
diff --git a/include/wx/msw/fdrepdlg.h b/include/wx/msw/fdrepdlg.h
index c00c5b46a4..c65e422c88 100644
--- a/include/wx/msw/fdrepdlg.h
+++ b/include/wx/msw/fdrepdlg.h
@@ -56,7 +56,7 @@ protected:
     wxFindReplaceDialogImpl *m_impl;
 
     DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
-    DECLARE_NO_COPY_CLASS(wxFindReplaceDialog)
+    wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialog);
 };
 
 #endif // _WX_MSW_FDREPDLG_H_
diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h
index 62203364ae..9f7fd8b34e 100644
--- a/include/wx/msw/filedlg.h
+++ b/include/wx/msw/filedlg.h
@@ -63,7 +63,7 @@ private:
     int m_centreDir;        // nothing to do if 0
 
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
-    DECLARE_NO_COPY_CLASS(wxFileDialog)
+    wxDECLARE_NO_COPY_CLASS(wxFileDialog);
 };
 
 #endif // _WX_FILEDLG_H_
diff --git a/include/wx/msw/headerctrl.h b/include/wx/msw/headerctrl.h
index 2d5603c332..069b73a606 100644
--- a/include/wx/msw/headerctrl.h
+++ b/include/wx/msw/headerctrl.h
@@ -126,7 +126,7 @@ private:
     // the offset of the window used to emulate scrolling it
     int m_scrollOffset;
 
-    DECLARE_NO_COPY_CLASS(wxHeaderCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
 };
 
 #endif // _WX_MSW_HEADERCTRL_H_
diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 3552d9d5aa..d5f78ffb5f 100644
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -120,7 +120,7 @@ protected:
     int m_style;
 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)
-    DECLARE_NO_COPY_CLASS(wxBestHelpController)
+    wxDECLARE_NO_COPY_CLASS(wxBestHelpController);
 };
 
 #endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP
diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index 80c794550e..c500b2ed42 100644
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -95,7 +95,7 @@ private:
   wxString m_strGroup,    // current group in appname.ini file
            m_strPath;     // the rest of the path (no trailing '_'!)
 
-  DECLARE_NO_COPY_CLASS(wxIniConfig)
+  wxDECLARE_NO_COPY_CLASS(wxIniConfig);
   DECLARE_ABSTRACT_CLASS(wxIniConfig)
 };
 
diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 13b7586b04..eb5f7bbcdb 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -465,7 +465,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxListCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxListCtrl);
 };
 
 #endif // _WX_LISTCTRL_H_
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 857f9bed3c..a2931c069c 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -146,7 +146,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
+    wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
 };
 
 // ---------------------------------------------------------------------------
diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 11cd119760..5af79e6c89 100644
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -107,7 +107,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
@@ -133,7 +133,7 @@ public:
 
 private:
     DECLARE_CLASS(wxMetafileDC)
-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 
 
diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 1ed42ae17d..8fd4d7a4e3 100644
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -59,7 +59,7 @@ private:
     WXHANDLE m_hook; // HHOOK used to position the message box
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-    DECLARE_NO_COPY_CLASS(wxMessageDialog)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialog);
 };
 
 
diff --git a/include/wx/msw/notifmsg.h b/include/wx/msw/notifmsg.h
index d39fbbd7c4..b4459b9aa4 100644
--- a/include/wx/msw/notifmsg.h
+++ b/include/wx/msw/notifmsg.h
@@ -67,7 +67,7 @@ private:
     class wxNotifMsgImpl *m_impl;
 
 
-    DECLARE_NO_COPY_CLASS(wxNotificationMessage)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessage);
 };
 
 #endif // _WX_MSW_NOTIFMSG_H_
diff --git a/include/wx/msw/ole/access.h b/include/wx/msw/ole/access.h
index f5898dea5e..1684ef72b2 100644
--- a/include/wx/msw/ole/access.h
+++ b/include/wx/msw/ole/access.h
@@ -59,7 +59,7 @@ private:
     void*           m_pIAccessibleStd;  // the pointer to the standard COM interface,
                                         // for default processing
 
-    DECLARE_NO_COPY_CLASS(wxAccessible)
+    wxDECLARE_NO_COPY_CLASS(wxAccessible);
 };
 
 #endif  //wxUSE_ACCESSIBILITY
diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index c119874092..41db577284 100644
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -94,7 +94,7 @@ public:
 public:
     WXIDISPATCH*  m_dispatchPtr;
 
-    DECLARE_NO_COPY_CLASS(wxAutomationObject)
+    wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
 };
 
 #endif // wxUSE_OLE_AUTOMATION
diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index a3dca45ea0..dc7a89c2f2 100644
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -73,7 +73,7 @@ public:
 private:
     IDataObject *m_pIDataObject; // pointer to the COM interface
 
-    DECLARE_NO_COPY_CLASS(wxDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxDataObject);
 };
 
 #endif  //_WX_MSW_OLE_DATAOBJ_H
diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h
index a22759676b..8cda74f5ea 100644
--- a/include/wx/msw/ole/dataobj2.h
+++ b/include/wx/msw/ole/dataobj2.h
@@ -51,7 +51,7 @@ private:
     // the DIB data
     void /* BITMAPINFO */ *m_data;
 
-    DECLARE_NO_COPY_CLASS(wxBitmapDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject);
 };
 
 // ----------------------------------------------------------------------------
@@ -84,7 +84,7 @@ public:
         { return SetData(len, buf); }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxBitmapDataObject2)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject2);
 };
 
 // ----------------------------------------------------------------------------
@@ -112,7 +112,7 @@ public:
         { return SetData(len, buf); }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxFileDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxFileDataObject);
 };
 
 // ----------------------------------------------------------------------------
@@ -140,7 +140,7 @@ private:
     // last data object we got data in
     wxDataObjectSimple *m_dataObjectLast;
 
-    DECLARE_NO_COPY_CLASS(wxURLDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxURLDataObject);
 };
 
 #endif // _WX_MSW_OLE_DATAOBJ2_H
diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h
index 4efd1b59f2..deb5a2e8f1 100644
--- a/include/wx/msw/ole/dropsrc.h
+++ b/include/wx/msw/ole/dropsrc.h
@@ -71,7 +71,7 @@ protected:
 private:
     wxIDropSource *m_pIDropSource;  // the pointer to COM interface
 
-    DECLARE_NO_COPY_CLASS(wxDropSource)
+    wxDECLARE_NO_COPY_CLASS(wxDropSource);
 };
 
 #endif  //wxUSE_DRAG_AND_DROP
diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h
index 6fc30359c8..0224655634 100644
--- a/include/wx/msw/ole/droptgt.h
+++ b/include/wx/msw/ole/droptgt.h
@@ -67,7 +67,7 @@ private:
     wxIDropTarget *m_pIDropTarget; // the pointer to our COM interface
     IDataObject   *m_pIDataSource; // the pointer to the source data object
 
-    DECLARE_NO_COPY_CLASS(wxDropTarget)
+    wxDECLARE_NO_COPY_CLASS(wxDropTarget);
 };
 
 #endif  //wxUSE_DRAG_AND_DROP
diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 06754215f3..3845d20ff8 100644
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -85,7 +85,7 @@ private:
     void*             m_printDlg;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
     DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 7d7e466ed9..3bcd415ade 100644
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -36,7 +36,7 @@ public:
 private:
     WXFARPROC     m_lpAbortProc;
 
-    DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
 };
 
 // ---------------------------------------------------------------------------
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 3a0ffc9e75..64895d855b 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -398,7 +398,7 @@ public:
 private:
     HDC m_hdc;
 
-    DECLARE_NO_COPY_CLASS(ScreenHDC)
+    wxDECLARE_NO_COPY_CLASS(ScreenHDC);
 };
 
 // the same as ScreenHDC but for window DCs
@@ -414,7 +414,7 @@ private:
    HWND m_hwnd;
    HDC m_hdc;
 
-   DECLARE_NO_COPY_CLASS(WindowHDC)
+   wxDECLARE_NO_COPY_CLASS(WindowHDC);
 };
 
 // the same as ScreenHDC but for memory DCs: creates the HDC compatible with
@@ -430,7 +430,7 @@ public:
 private:
     HDC m_hdc;
 
-    DECLARE_NO_COPY_CLASS(MemoryHDC)
+    wxDECLARE_NO_COPY_CLASS(MemoryHDC);
 };
 
 // a class which selects a GDI object into a DC in its ctor and deselects in
@@ -462,7 +462,7 @@ private:
     HDC m_hdc;
     HGDIOBJ m_hgdiobj;
 
-    DECLARE_NO_COPY_CLASS(SelectInHDC)
+    wxDECLARE_NO_COPY_CLASS(SelectInHDC);
 };
 
 // a class which cleans up any GDI object
@@ -579,7 +579,7 @@ public:
 private:
     HDC m_hdc;
 
-    DECLARE_NO_COPY_CLASS(HDCClipper)
+    wxDECLARE_NO_COPY_CLASS(HDCClipper);
 };
 
 // set the given map mode for the life time of this object
@@ -610,7 +610,7 @@ private:
         HDC m_hdc;
         int m_modeOld;
 
-        DECLARE_NO_COPY_CLASS(HDCMapModeChanger)
+        wxDECLARE_NO_COPY_CLASS(HDCMapModeChanger);
     };
 
     #define wxCHANGE_HDC_MAP_MODE(hdc, mm) \
@@ -652,7 +652,7 @@ public:
 private:
     HGLOBAL m_hGlobal;
 
-    DECLARE_NO_COPY_CLASS(GlobalPtr)
+    wxDECLARE_NO_COPY_CLASS(GlobalPtr);
 };
 
 // when working with global pointers (which is unfortunately still necessary
@@ -710,7 +710,7 @@ private:
     HGLOBAL m_hGlobal;
     void *m_ptr;
 
-    DECLARE_NO_COPY_CLASS(GlobalPtrLock)
+    wxDECLARE_NO_COPY_CLASS(GlobalPtrLock);
 };
 
 // register the class when it is first needed and unregister it in dtor
diff --git a/include/wx/msw/private/sockmsw.h b/include/wx/msw/private/sockmsw.h
index 5313b5446e..ca3384d43d 100644
--- a/include/wx/msw/private/sockmsw.h
+++ b/include/wx/msw/private/sockmsw.h
@@ -61,7 +61,7 @@ private:
 
     friend class wxSocketMSWManager;
 
-    DECLARE_NO_COPY_CLASS(wxSocketImplMSW)
+    wxDECLARE_NO_COPY_CLASS(wxSocketImplMSW);
 };
 
 #endif  /* _WX_MSW_GSOCKMSW_H_ */
diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index a0809e76fc..ecb9e3efab 100644
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -175,7 +175,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
-    DECLARE_NO_COPY_CLASS(wxRadioBox)
+    wxDECLARE_NO_COPY_CLASS(wxRadioBox);
 };
 
 #endif
diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index d90dec3bb0..b49c3bb6e1 100644
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -106,7 +106,7 @@ private:
   // current path (not '/' terminated)
   wxString  m_strPath;
 
-  DECLARE_NO_COPY_CLASS(wxRegConfig)
+  wxDECLARE_NO_COPY_CLASS(wxRegConfig);
   DECLARE_ABSTRACT_CLASS(wxRegConfig)
 };
 
diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 5ef5411264..654290ea2f 100644
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -243,7 +243,7 @@ private:
   long        m_dwLastError;    // last error (0 if none)
 
 
-  DECLARE_NO_COPY_CLASS(wxRegKey)
+  wxDECLARE_NO_COPY_CLASS(wxRegKey);
 };
 
 #endif // wxUSE_REGKEY
diff --git a/include/wx/msw/sound.h b/include/wx/msw/sound.h
index 21a71d0e77..47a6967156 100644
--- a/include/wx/msw/sound.h
+++ b/include/wx/msw/sound.h
@@ -43,7 +43,7 @@ private:
     // data of this object
     class wxSoundData *m_data;
 
-    DECLARE_NO_COPY_CLASS(wxSound)
+    wxDECLARE_NO_COPY_CLASS(wxSound);
 };
 
 #endif // wxUSE_SOUND
diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 8f200c0267..036ac2b1f3 100644
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -133,7 +133,7 @@ protected:
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxSpinCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxSpinCtrl);
 };
 
 #endif // wxUSE_SPINCTRL
diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 7989fce4bc..71cffec52b 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -86,7 +86,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
 };
 
 #endif
diff --git a/include/wx/msw/subwin.h b/include/wx/msw/subwin.h
index 27f5f714cc..2c877186eb 100644
--- a/include/wx/msw/subwin.h
+++ b/include/wx/msw/subwin.h
@@ -165,7 +165,7 @@ private:
     wxWindowIDRef *m_ids;
 
 
-    DECLARE_NO_COPY_CLASS(wxSubwindows)
+    wxDECLARE_NO_COPY_CLASS(wxSubwindows);
 };
 
 // convenient macro to forward a few methods which are usually propagated to
diff --git a/include/wx/msw/tls.h b/include/wx/msw/tls.h
index eee0096c97..c27271ca60 100644
--- a/include/wx/msw/tls.h
+++ b/include/wx/msw/tls.h
@@ -51,7 +51,7 @@ public:
 private:
     DWORD m_slot;
 
-    DECLARE_NO_COPY_CLASS(wxTlsKey)
+    wxDECLARE_NO_COPY_CLASS(wxTlsKey);
 };
 
 #endif // _WX_MSW_TLS_H_
diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h
index 7a689eba01..b835541e80 100644
--- a/include/wx/msw/toolbar.h
+++ b/include/wx/msw/toolbar.h
@@ -151,7 +151,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
-    DECLARE_NO_COPY_CLASS(wxToolBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolBar);
 };
 
 #endif // wxUSE_TOOLBAR
diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index e8a0867981..7575d5f3b0 100644
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -76,7 +76,7 @@ private:
     wxWindow *m_window;         // window we're associated with
 
     DECLARE_ABSTRACT_CLASS(wxToolTip)
-    DECLARE_NO_COPY_CLASS(wxToolTip)
+    wxDECLARE_NO_COPY_CLASS(wxToolTip);
 };
 
 #endif // _WX_MSW_TOOLTIP_H_
diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 1af76489f9..43721fa25f 100644
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -206,7 +206,7 @@ private:
 #endif
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
+    wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_
diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index ad8d31210d..31eb2469f1 100644
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -277,7 +277,7 @@ private:
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
-    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
 };
 
 #endif // wxUSE_TREECTRL
diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index 53aca8a059..6424fc6118 100644
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -168,7 +168,7 @@ private:
     friend class wxUxThemeModule;
 #endif // wxUSE_UXTHEME
 
-    DECLARE_NO_COPY_CLASS(wxUxThemeEngine)
+    wxDECLARE_NO_COPY_CLASS(wxUxThemeEngine);
 };
 
 #if wxUSE_UXTHEME
@@ -223,7 +223,7 @@ public:
 private:
     HTHEME m_hTheme;
 
-    DECLARE_NO_COPY_CLASS(wxUxThemeHandle)
+    wxDECLARE_NO_COPY_CLASS(wxUxThemeHandle);
 };
 
 #endif // _WX_UXTHEME_H_
diff --git a/include/wx/msw/wince/tbarwce.h b/include/wx/msw/wince/tbarwce.h
index 9d92442765..8b4618e2a4 100644
--- a/include/wx/msw/wince/tbarwce.h
+++ b/include/wx/msw/wince/tbarwce.h
@@ -69,7 +69,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
-    DECLARE_NO_COPY_CLASS(wxToolBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolBar);
 };
 
 #else
@@ -158,7 +158,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolMenuBar)
-    DECLARE_NO_COPY_CLASS(wxToolMenuBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolMenuBar);
 };
 
 #endif
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 61f2bb4ae4..9ec35ebfa4 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -573,7 +573,7 @@ private:
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
-    DECLARE_NO_COPY_CLASS(wxWindowMSW)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMSW);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/include/wx/msw/wrapshl.h b/include/wx/msw/wrapshl.h
index 195ae3f374..163f96b0a2 100644
--- a/include/wx/msw/wrapshl.h
+++ b/include/wx/msw/wrapshl.h
@@ -81,7 +81,7 @@ public:
 private:
     LPITEMIDLIST m_pidl;
 
-    DECLARE_NO_COPY_CLASS(wxItemIdList)
+    wxDECLARE_NO_COPY_CLASS(wxItemIdList);
 };
 
 // enable autocompleting filenames in the text control with given HWND
diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h
index be24584745..f38d8e978f 100644
--- a/include/wx/nativewin.h
+++ b/include/wx/nativewin.h
@@ -159,7 +159,7 @@ protected:
 #endif // __WXMSW__
 
 private:
-    DECLARE_NO_COPY_CLASS(wxNativeContainerWindow)
+    wxDECLARE_NO_COPY_CLASS(wxNativeContainerWindow);
 };
 
 #endif // wxHAS_NATIVE_CONTAINER_WINDOW
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index b636d5910d..96278d07d3 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -104,7 +104,7 @@ public:
     virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
 
 protected:
-    DECLARE_NO_COPY_CLASS(wxNotebookBase)
+    wxDECLARE_NO_COPY_CLASS(wxNotebookBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/notifmsg.h b/include/wx/notifmsg.h
index 46288e62e1..fa64720955 100644
--- a/include/wx/notifmsg.h
+++ b/include/wx/notifmsg.h
@@ -124,7 +124,7 @@ private:
 
     int m_flags;
 
-    DECLARE_NO_COPY_CLASS(wxNotificationMessageBase)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessageBase);
 };
 
 #if defined(__WXGTK__) && wxUSE_LIBHILDON
diff --git a/include/wx/object.h b/include/wx/object.h
index 0f2f72b3f7..b5f34262d6 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -155,7 +155,7 @@ protected:
     void Register();
     void Unregister();
 
-    DECLARE_NO_COPY_CLASS(wxClassInfo)
+    wxDECLARE_NO_COPY_CLASS(wxClassInfo);
 };
 
 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 26716011af..93c1dd37d6 100644
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -118,7 +118,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);
 };
 #endif
     // _WX_APP_H_
diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index a69cbd7126..3f0c81fc4a 100644
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -52,7 +52,7 @@ protected:
 private:
     SIZEL                   m_PageSize;
     DECLARE_CLASS(wxWindowDCImpl)
-    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
 }; // end of CLASS wxWindowDC
 
 class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
@@ -73,7 +73,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxClientDCImpl)
-    DECLARE_NO_COPY_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
 }; // end of CLASS wxClientDC
 
 class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
@@ -96,7 +96,7 @@ protected:
     wxPaintDCInfo* FindInCache(size_t* pIndex = NULL) const;
 private:
     DECLARE_CLASS(wxPaintDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
 }; // end of wxPaintDC
 
 #endif
diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index 62b9923d2d..10ca985c09 100644
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -37,7 +37,7 @@ protected:
     void Init(void);
 private:
     DECLARE_CLASS(wxMemoryDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 }; // end of CLASS wxMemoryDCImpl
 
 #endif
diff --git a/include/wx/os2/dcprint.h b/include/wx/os2/dcprint.h
index e967827cbe..6418f99a31 100644
--- a/include/wx/os2/dcprint.h
+++ b/include/wx/os2/dcprint.h
@@ -60,7 +60,7 @@ protected:
     wxPrintData                     m_printData;
 private:
     DECLARE_CLASS(wxPrinterDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPrinterDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
 }; // end of CLASS wxPrinterDC
 
 // Gets an HDC for the specified printer configuration
diff --git a/include/wx/os2/dcscreen.h b/include/wx/os2/dcscreen.h
index f10fc0058d..49435267f9 100644
--- a/include/wx/os2/dcscreen.h
+++ b/include/wx/os2/dcscreen.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxPMDCImpl
 
 private:
     DECLARE_CLASS(wxScreenDCImpl)
-    DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 }; // end of CLASS wxScreenDC
 
 #endif
diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 49898cbf7f..5555122df4 100644
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -122,7 +122,7 @@ private:
     class wxWindowDisabler*         m_pWindowDisabler;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);
 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_
diff --git a/include/wx/os2/listctrl.h b/include/wx/os2/listctrl.h
index 08910649fc..ddece5a697 100644
--- a/include/wx/os2/listctrl.h
+++ b/include/wx/os2/listctrl.h
@@ -531,7 +531,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxListCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxListCtrl);
 }; // end of CLASS wxListCtrl
 
 #endif // wxUSE_LISTCTRL
diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 27f04a6604..ada9546705 100644
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -103,7 +103,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
@@ -136,7 +136,7 @@ public:
 
 private:
     DECLARE_CLASS(wxMetafileDC)
-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 
 /*
diff --git a/include/wx/os2/tls.h b/include/wx/os2/tls.h
index 9746f3cf93..4c22721fb3 100644
--- a/include/wx/os2/tls.h
+++ b/include/wx/os2/tls.h
@@ -54,7 +54,7 @@ public:
 private:
     ULONG* m_slot;
 
-    DECLARE_NO_COPY_CLASS(wxTlsKey)
+    wxDECLARE_NO_COPY_CLASS(wxTlsKey);
 };
 
 #endif // _WX_OS2_TLS_H_
diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h
index 6b81a77292..4a99d302bf 100644
--- a/include/wx/os2/treectrl.h
+++ b/include/wx/os2/treectrl.h
@@ -624,7 +624,7 @@ private:
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
-    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
 }; // end of CLASS wxTreeCtrl
 
 #endif // wxUSE_TREECTRL
diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 6f2294c6b5..14e664fa69 100644
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -534,7 +534,7 @@ private:
     SWP                             m_vWinSwp;
 
     DECLARE_DYNAMIC_CLASS(wxWindowOS2);
-    DECLARE_NO_COPY_CLASS(wxWindowOS2)
+    wxDECLARE_NO_COPY_CLASS(wxWindowOS2);
     DECLARE_EVENT_TABLE()
 }; // end of wxWindow
 
diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h
index a642ed6e82..2cdaf00c34 100644
--- a/include/wx/osx/carbon/dataview.h
+++ b/include/wx/osx/carbon/dataview.h
@@ -605,7 +605,7 @@ private:
 
  // wxWidget internal stuff:
   DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
-  DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
+  wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);
   DECLARE_EVENT_TABLE()
 };
 
diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index f6ed9b27ec..d4a25caee5 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -43,7 +43,7 @@ wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from
 
 class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
 {
-    DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver)
+    wxDECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver);
 
 public:
     wxMacCGContextStateSaver( CGContextRef cg )
diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h
index 3c677f99ad..a039a144ef 100644
--- a/include/wx/osx/dcclient.h
+++ b/include/wx/osx/dcclient.h
@@ -38,7 +38,7 @@ protected:
     int m_height;
 
     DECLARE_CLASS(wxWindowDCImpl)
-    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
 };
 
 
@@ -51,7 +51,7 @@ public:
 
 private:
     DECLARE_CLASS(wxClientDCImpl)
-    DECLARE_NO_COPY_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
 };
 
 
@@ -64,7 +64,7 @@ public:
 
 protected:
     DECLARE_CLASS(wxPaintDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
 };
 
 
diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 6e4f1e0845..382d79b01c 100644
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -39,7 +39,7 @@ private:
     wxBitmap  m_selected;
     
     DECLARE_CLASS(wxMemoryDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 
 #endif
diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h
index cf6c925ab6..f23c4a6f76 100644
--- a/include/wx/osx/dcscreen.h
+++ b/include/wx/osx/dcscreen.h
@@ -27,7 +27,7 @@ private:
         
 private:
     DECLARE_CLASS(wxScreenDCImpl)
-    DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 
 #endif
diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h
index 2d032aaad7..9f2d2ca9ff 100644
--- a/include/wx/osx/glcanvas.h
+++ b/include/wx/osx/glcanvas.h
@@ -38,7 +38,7 @@ public:
 private:
     WXGLContext m_glContext;
 
-    DECLARE_NO_COPY_CLASS(wxGLContext)
+    wxDECLARE_NO_COPY_CLASS(wxGLContext);
 };
 
 class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index da6e0ec509..07c93e8262 100644
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -95,7 +95,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
@@ -117,7 +117,7 @@ class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
 
 private:
     DECLARE_CLASS(wxMetafileDC)
-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 
 
diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 999f126e8a..d228363115 100644
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -338,7 +338,7 @@ private:
     void DoUpdateScrollbarVisibility();
 
 
-    DECLARE_NO_COPY_CLASS(wxWindowMac)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMac);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/include/wx/overlay.h b/include/wx/overlay.h
index 831fd8f1ba..2c00fcb897 100644
--- a/include/wx/overlay.h
+++ b/include/wx/overlay.h
@@ -63,7 +63,7 @@ private:
     bool m_inDrawing;
 
 
-    DECLARE_NO_COPY_CLASS(wxOverlay)
+    wxDECLARE_NO_COPY_CLASS(wxOverlay);
 };
 
 
@@ -91,7 +91,7 @@ private:
     wxDC* m_dc;
 
 
-    DECLARE_NO_COPY_CLASS(wxDCOverlay)
+    wxDECLARE_NO_COPY_CLASS(wxDCOverlay);
 };
 
 #endif // _WX_OVERLAY_H_
diff --git a/include/wx/palmos/app.h b/include/wx/palmos/app.h
index 84d740ea64..292830482d 100644
--- a/include/wx/palmos/app.h
+++ b/include/wx/palmos/app.h
@@ -74,7 +74,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/palmos/caret.h b/include/wx/palmos/caret.h
index 0221481407..73a85d0007 100644
--- a/include/wx/palmos/caret.h
+++ b/include/wx/palmos/caret.h
@@ -56,7 +56,7 @@ protected:
 private:
     bool m_hasCaret;
 
-    DECLARE_NO_COPY_CLASS(wxCaret)
+    wxDECLARE_NO_COPY_CLASS(wxCaret);
 };
 
 #endif // _WX_CARET_H_
diff --git a/include/wx/palmos/dc.h b/include/wx/palmos/dc.h
index c3170a5de4..07565d3b4f 100644
--- a/include/wx/palmos/dc.h
+++ b/include/wx/palmos/dc.h
@@ -307,7 +307,7 @@ protected:
 #endif
 
     DECLARE_CLASS(wxPalmDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPalmDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPalmDCImpl);
 };
 
 // ----------------------------------------------------------------------------
@@ -348,7 +348,7 @@ private:
     // find it ourselves
     const wxSize m_size;
 
-    DECLARE_NO_COPY_CLASS(wxDCTempImpl)
+    wxDECLARE_NO_COPY_CLASS(wxDCTempImpl);
 };
 
 class WXDLLIMPEXP_CORE wxDCTemp : public wxDC
diff --git a/include/wx/palmos/dcclient.h b/include/wx/palmos/dcclient.h
index d45b754e44..2adc68fb5b 100644
--- a/include/wx/palmos/dcclient.h
+++ b/include/wx/palmos/dcclient.h
@@ -50,7 +50,7 @@ protected:
     void InitDC();
 
     DECLARE_CLASS(wxWindowDCImpl)
-    DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
@@ -70,7 +70,7 @@ protected:
     void InitDC();
 
     DECLARE_CLASS(wxClientDCImpl)
-    DECLARE_NO_COPY_CLASS(wxClientDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
@@ -93,7 +93,7 @@ protected:
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
     DECLARE_CLASS(wxPaintDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPaintDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
 };
 
 #endif
diff --git a/include/wx/palmos/dcmemory.h b/include/wx/palmos/dcmemory.h
index 59b69f9859..96429f43b8 100644
--- a/include/wx/palmos/dcmemory.h
+++ b/include/wx/palmos/dcmemory.h
@@ -36,7 +36,7 @@ protected:
     void Init();
 
     DECLARE_CLASS(wxMemoryDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 
 #endif
diff --git a/include/wx/palmos/dcscreen.h b/include/wx/palmos/dcscreen.h
index 986247f701..cb9f6a2649 100644
--- a/include/wx/palmos/dcscreen.h
+++ b/include/wx/palmos/dcscreen.h
@@ -24,7 +24,7 @@ public:
     virtual void DoGetSize(int *w, int *h) const;
 
     DECLARE_CLASS(wxScreenDCImpl)
-    DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 
 #endif
diff --git a/include/wx/palmos/dialog.h b/include/wx/palmos/dialog.h
index 9fd8edeb76..e8f66f58c0 100644
--- a/include/wx/palmos/dialog.h
+++ b/include/wx/palmos/dialog.h
@@ -82,7 +82,7 @@ private:
 
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);
 };
 
 #endif
diff --git a/include/wx/palmos/dragimag.h b/include/wx/palmos/dragimag.h
index 774dd768b4..bf98c42852 100644
--- a/include/wx/palmos/dragimag.h
+++ b/include/wx/palmos/dragimag.h
@@ -255,7 +255,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
-    DECLARE_NO_COPY_CLASS(wxDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxDragImage);
 };
 
 #endif
diff --git a/include/wx/palmos/enhmeta.h b/include/wx/palmos/enhmeta.h
index 70c0c924da..31feac5557 100644
--- a/include/wx/palmos/enhmeta.h
+++ b/include/wx/palmos/enhmeta.h
@@ -126,7 +126,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject);
 };
 
 
@@ -169,7 +169,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);
 };
 
 #endif // wxUSE_DRAG_AND_DROP
diff --git a/include/wx/palmos/fdrepdlg.h b/include/wx/palmos/fdrepdlg.h
index e28870f29a..b6e66481d1 100644
--- a/include/wx/palmos/fdrepdlg.h
+++ b/include/wx/palmos/fdrepdlg.h
@@ -56,7 +56,7 @@ protected:
     wxFindReplaceDialogImpl *m_impl;
 
     DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
-    DECLARE_NO_COPY_CLASS(wxFindReplaceDialog)
+    wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialog);
 };
 
 #endif // _WX_PALMOS_FDREPDLG_H_
diff --git a/include/wx/palmos/filedlg.h b/include/wx/palmos/filedlg.h
index ca9ecafbd2..e7ce26b98a 100644
--- a/include/wx/palmos/filedlg.h
+++ b/include/wx/palmos/filedlg.h
@@ -39,7 +39,7 @@ private:
     wxArrayString m_fileNames;
 
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
-    DECLARE_NO_COPY_CLASS(wxFileDialog)
+    wxDECLARE_NO_COPY_CLASS(wxFileDialog);
 };
 
 #endif // _WX_FILEDLG_H_
diff --git a/include/wx/palmos/listctrl.h b/include/wx/palmos/listctrl.h
index 88372b49ad..91a6eaf5e4 100644
--- a/include/wx/palmos/listctrl.h
+++ b/include/wx/palmos/listctrl.h
@@ -388,7 +388,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxListCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxListCtrl);
 };
 
 #endif // wxUSE_LISTCTRL
diff --git a/include/wx/palmos/mdi.h b/include/wx/palmos/mdi.h
index e4d3f07c86..97bd63b30f 100644
--- a/include/wx/palmos/mdi.h
+++ b/include/wx/palmos/mdi.h
@@ -103,7 +103,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
+    wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
 };
 
 // ---------------------------------------------------------------------------
diff --git a/include/wx/palmos/msgdlg.h b/include/wx/palmos/msgdlg.h
index e337c0c7e3..c38168cb6a 100644
--- a/include/wx/palmos/msgdlg.h
+++ b/include/wx/palmos/msgdlg.h
@@ -27,7 +27,7 @@ public:
     virtual int ShowModal(void);
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-    DECLARE_NO_COPY_CLASS(wxMessageDialog)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialog);
 };
 
 
diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h
index 7381b3381f..58eecece9e 100644
--- a/include/wx/palmos/pen.h
+++ b/include/wx/palmos/pen.h
@@ -57,7 +57,7 @@ private:
     friend class WXDLLIMPEXP_FWD_CORE wxPen;
 
     // Cannot use
-    //  DECLARE_NO_COPY_CLASS(wxPenRefData)
+    //  wxDECLARE_NO_COPY_CLASS(wxPenRefData);
     // because copy constructor is explicitly declared above;
     // but no copy assignment operator is defined, so declare
     // it private to prevent the compiler from defining it:
diff --git a/include/wx/palmos/prefconf.h b/include/wx/palmos/prefconf.h
index 1ca9a013ee..6f7a5af4de 100644
--- a/include/wx/palmos/prefconf.h
+++ b/include/wx/palmos/prefconf.h
@@ -83,7 +83,7 @@ private:
   // current group modified ?
   bool m_modGroup;
 
-  DECLARE_NO_COPY_CLASS(wxPrefConfig)
+  wxDECLARE_NO_COPY_CLASS(wxPrefConfig);
   DECLARE_ABSTRACT_CLASS(wxPrefConfig)
 };
 
diff --git a/include/wx/palmos/printdlg.h b/include/wx/palmos/printdlg.h
index 9ba71df71b..67cc38ac9b 100644
--- a/include/wx/palmos/printdlg.h
+++ b/include/wx/palmos/printdlg.h
@@ -46,7 +46,7 @@ private:
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
 
-    DECLARE_NO_COPY_CLASS(wxPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPrintDialog);
 };
 
 class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxDialog
@@ -67,7 +67,7 @@ private:
     wxPageSetupData   m_pageSetupData;
     wxWindow*         m_dialogParent;
 
-    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/include/wx/palmos/printpalm.h b/include/wx/palmos/printpalm.h
index 545643082b..c16ea5ec27 100644
--- a/include/wx/palmos/printpalm.h
+++ b/include/wx/palmos/printpalm.h
@@ -35,7 +35,7 @@ public:
 private:
     WXFARPROC     m_lpAbortProc;
 
-    DECLARE_NO_COPY_CLASS(wxPalmPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxPalmPrinter);
 };
 
 // ---------------------------------------------------------------------------
diff --git a/include/wx/palmos/progdlg.h b/include/wx/palmos/progdlg.h
index f37db2e9e0..d3f4c0ca14 100644
--- a/include/wx/palmos/progdlg.h
+++ b/include/wx/palmos/progdlg.h
@@ -50,7 +50,7 @@ private:
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }
 
-    DECLARE_NO_COPY_CLASS(wxProgressDialog)
+    wxDECLARE_NO_COPY_CLASS(wxProgressDialog);
 };
 
 #endif // wxUSE_PROGRESSDLG
diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h
index e0b2ec666b..d77fce4bfe 100644
--- a/include/wx/palmos/radiobox.h
+++ b/include/wx/palmos/radiobox.h
@@ -163,7 +163,7 @@ private:
     wxHashTable m_radios;
 
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
-    DECLARE_NO_COPY_CLASS(wxRadioBox)
+    wxDECLARE_NO_COPY_CLASS(wxRadioBox);
 };
 
 #endif
diff --git a/include/wx/palmos/sound.h b/include/wx/palmos/sound.h
index 7b813f5b61..9322b2031d 100644
--- a/include/wx/palmos/sound.h
+++ b/include/wx/palmos/sound.h
@@ -44,7 +44,7 @@ private:
   int   m_waveLength;
   bool  m_isResource;
 
-    DECLARE_NO_COPY_CLASS(wxSound)
+    wxDECLARE_NO_COPY_CLASS(wxSound);
 };
 #endif
 #endif
diff --git a/include/wx/palmos/spinctrl.h b/include/wx/palmos/spinctrl.h
index 677c340625..912eb5532c 100644
--- a/include/wx/palmos/spinctrl.h
+++ b/include/wx/palmos/spinctrl.h
@@ -109,7 +109,7 @@ protected:
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxSpinCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxSpinCtrl);
 };
 
 #endif // _WX_PALMOS_SPINCTRL_H_
diff --git a/include/wx/palmos/statbmp.h b/include/wx/palmos/statbmp.h
index b54ec30d9c..556e853483 100644
--- a/include/wx/palmos/statbmp.h
+++ b/include/wx/palmos/statbmp.h
@@ -93,7 +93,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
 };
 
 #endif
diff --git a/include/wx/palmos/toolbar.h b/include/wx/palmos/toolbar.h
index 27b9291093..a0db54f1c3 100644
--- a/include/wx/palmos/toolbar.h
+++ b/include/wx/palmos/toolbar.h
@@ -104,7 +104,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
-    DECLARE_NO_COPY_CLASS(wxToolBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolBar);
 };
 
 #endif // wxUSE_TOOLBAR
diff --git a/include/wx/palmos/tooltip.h b/include/wx/palmos/tooltip.h
index 31b05273cc..447dd4d9a8 100644
--- a/include/wx/palmos/tooltip.h
+++ b/include/wx/palmos/tooltip.h
@@ -62,7 +62,7 @@ private:
     wxWindow *m_window;         // window we're associated with
 
     DECLARE_ABSTRACT_CLASS(wxToolTip)
-    DECLARE_NO_COPY_CLASS(wxToolTip)
+    wxDECLARE_NO_COPY_CLASS(wxToolTip);
 };
 
 #endif // _WX_PALMOS_TOOLTIP_H_
diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h
index c690943259..3879c63bae 100644
--- a/include/wx/palmos/toplevel.h
+++ b/include/wx/palmos/toplevel.h
@@ -121,7 +121,7 @@ protected:
     wxWindow             *m_winLastFocused;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm)
+    wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm);
 };
 
 #endif // _WX_PALMOS_TOPLEVEL_H_
diff --git a/include/wx/palmos/treectrl.h b/include/wx/palmos/treectrl.h
index 9349196ef7..6056ae3850 100644
--- a/include/wx/palmos/treectrl.h
+++ b/include/wx/palmos/treectrl.h
@@ -425,7 +425,7 @@ private:
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
-    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
 };
 
 #endif // wxUSE_TREECTRL
diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h
index 354d8173c7..f95bc1e347 100644
--- a/include/wx/palmos/window.h
+++ b/include/wx/palmos/window.h
@@ -270,7 +270,7 @@ private:
     bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
 
     DECLARE_DYNAMIC_CLASS(wxWindowPalm)
-    DECLARE_NO_COPY_CLASS(wxWindowPalm)
+    wxDECLARE_NO_COPY_CLASS(wxWindowPalm);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/include/wx/persist.h b/include/wx/persist.h
index 02c9607c10..a46935fd90 100644
--- a/include/wx/persist.h
+++ b/include/wx/persist.h
@@ -161,7 +161,7 @@ private:
     bool m_doSave,
          m_doRestore;
 
-    DECLARE_NO_COPY_CLASS(wxPersistenceManager)
+    wxDECLARE_NO_COPY_CLASS(wxPersistenceManager);
 };
 
 // ----------------------------------------------------------------------------
@@ -218,7 +218,7 @@ protected:
 private:
     void * const m_obj;
 
-    DECLARE_NO_COPY_CLASS(wxPersistentObject)
+    wxDECLARE_NO_COPY_CLASS(wxPersistentObject);
 };
 
 // FIXME-VC6: VC6 has troubles with template methods of DLL-exported classes,
diff --git a/include/wx/persist/window.h b/include/wx/persist/window.h
index 692e143a13..01ff6489d1 100644
--- a/include/wx/persist/window.h
+++ b/include/wx/persist/window.h
@@ -64,7 +64,7 @@ private:
         wxPersistenceManager::Get().SaveAndUnregister(GetWindow());
     }
 
-    DECLARE_NO_COPY_CLASS(wxPersistentWindowBase)
+    wxDECLARE_NO_COPY_CLASS(wxPersistentWindowBase);
 };
 
 template 
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 372bf523d4..8edf59c74f 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -47,7 +47,7 @@ public:
 
     virtual bool IsTopLevel() const { return true; }
 
-    DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
+    wxDECLARE_NO_COPY_CLASS(wxPopupWindowBase);
 };
 
 
@@ -150,7 +150,7 @@ protected:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
-    DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
+    wxDECLARE_NO_COPY_CLASS(wxPopupTransientWindow);
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 1889279904..757f822eed 100644
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -43,7 +43,7 @@ public:
     
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintDialogBase)
-    DECLARE_NO_COPY_CLASS(wxPrintDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase);
 };
 
 // ---------------------------------------------------------------------------
@@ -68,7 +68,7 @@ private:
     
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
-    DECLARE_NO_COPY_CLASS(wxPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPrintDialog);
 };
 
 // ---------------------------------------------------------------------------
@@ -90,7 +90,7 @@ public:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase)
-    DECLARE_NO_COPY_CLASS(wxPageSetupDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialogBase);
 };
 
 // ---------------------------------------------------------------------------
@@ -113,7 +113,7 @@ private:
     
 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
-    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);
 };
 
 #endif
diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h
index 8567852a87..898c37c093 100644
--- a/include/wx/private/fileback.h
+++ b/include/wx/private/fileback.h
@@ -75,7 +75,7 @@ private:
     wxBackingFile m_backer;
     wxFileOffset m_pos;
 
-    DECLARE_NO_COPY_CLASS(wxBackedInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxBackedInputStream);
 };
 
 #endif // wxUSE_FILESYSTEM
diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index 0e2d15ae91..936eb13b5e 100644
--- a/include/wx/private/socket.h
+++ b/include/wx/private/socket.h
@@ -365,7 +365,7 @@ private:
     // socket is shut down
     wxSocketBase *m_wxsocket;
 
-    DECLARE_NO_COPY_CLASS(wxSocketImpl)
+    wxDECLARE_NO_COPY_CLASS(wxSocketImpl);
 };
 
 #if defined(__WXMSW__)
diff --git a/include/wx/private/timer.h b/include/wx/private/timer.h
index 5178b3cf0f..ffc2758a72 100644
--- a/include/wx/private/timer.h
+++ b/include/wx/private/timer.h
@@ -67,7 +67,7 @@ protected:
     bool    m_oneShot;      // true if one shot
 
 
-    DECLARE_NO_COPY_CLASS(wxTimerImpl)
+    wxDECLARE_NO_COPY_CLASS(wxTimerImpl);
 };
 
 #endif // _WX_TIMERIMPL_H_BASE_
diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 031f638afa..0a6aecaa46 100644
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -155,7 +155,7 @@ public:
 
 private:
     DECLARE_CLASS(wxPrintNativeDataBase)
-    DECLARE_NO_COPY_CLASS(wxPrintNativeDataBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrintNativeDataBase);
 };
 
 //----------------------------------------------------------------------------
@@ -199,7 +199,7 @@ public:
 
 private:
     DECLARE_CLASS(wxPrinterBase)
-    DECLARE_NO_COPY_CLASS(wxPrinterBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrinterBase);
 };
 
 //----------------------------------------------------------------------------
@@ -226,7 +226,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxPrinter)
-    DECLARE_NO_COPY_CLASS(wxPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxPrinter);
 };
 
 //----------------------------------------------------------------------------
@@ -318,7 +318,7 @@ private:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintout)
-    DECLARE_NO_COPY_CLASS(wxPrintout)
+    wxDECLARE_NO_COPY_CLASS(wxPrintout);
 };
 
 //----------------------------------------------------------------------------
@@ -357,7 +357,7 @@ private:
 
     DECLARE_CLASS(wxPreviewCanvas)
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxPreviewCanvas)
+    wxDECLARE_NO_COPY_CLASS(wxPreviewCanvas);
 };
 
 //----------------------------------------------------------------------------
@@ -398,7 +398,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxPreviewFrame)
-    DECLARE_NO_COPY_CLASS(wxPreviewFrame)
+    wxDECLARE_NO_COPY_CLASS(wxPreviewFrame);
 };
 
 //----------------------------------------------------------------------------
@@ -482,7 +482,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxPreviewControlBar)
+    wxDECLARE_NO_COPY_CLASS(wxPreviewControlBar);
 };
 
 //----------------------------------------------------------------------------
@@ -596,7 +596,7 @@ protected:
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
-    DECLARE_NO_COPY_CLASS(wxPrintPreviewBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrintPreviewBase);
     DECLARE_CLASS(wxPrintPreviewBase)
 };
 
@@ -650,7 +650,7 @@ private:
 
 private:
     DECLARE_CLASS(wxPrintPreview)
-    DECLARE_NO_COPY_CLASS(wxPrintPreview)
+    wxDECLARE_NO_COPY_CLASS(wxPrintPreview);
 };
 
 //----------------------------------------------------------------------------
@@ -674,7 +674,7 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxPrintAbortDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPrintAbortDialog);
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/include/wx/process.h b/include/wx/process.h
index 99dd8ab20e..814f3e06a5 100644
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -123,7 +123,7 @@ protected:
     bool m_redirect;
 
     DECLARE_DYNAMIC_CLASS(wxProcess)
-    DECLARE_NO_COPY_CLASS(wxProcess)
+    wxDECLARE_NO_COPY_CLASS(wxProcess);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 6bcd4b893b..1e99661b1e 100644
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -75,7 +75,7 @@ protected:
 
     DECLARE_DYNAMIC_CLASS(wxHTTP)
     DECLARE_PROTOCOL(wxHTTP)
-    DECLARE_NO_COPY_CLASS(wxHTTP)
+    wxDECLARE_NO_COPY_CLASS(wxHTTP);
 };
 
 #endif // wxUSE_PROTOCOL_HTTP
diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index 012d830b4e..f26d22ba89 100644
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -141,7 +141,7 @@ protected:
     friend class wxURL;
 
     DECLARE_DYNAMIC_CLASS(wxProtoInfo)
-    DECLARE_NO_COPY_CLASS(wxProtoInfo)
+    wxDECLARE_NO_COPY_CLASS(wxProtoInfo);
 };
 
 #endif // wxUSE_PROTOCOL
diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h
index 737671db3b..de7fbb394c 100644
--- a/include/wx/rearrangectrl.h
+++ b/include/wx/rearrangectrl.h
@@ -109,7 +109,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxRearrangeList)
+    wxDECLARE_NO_COPY_CLASS(wxRearrangeList);
 };
 
 // ----------------------------------------------------------------------------
@@ -166,7 +166,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxRearrangeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxRearrangeCtrl);
 };
 
 // ----------------------------------------------------------------------------
@@ -224,7 +224,7 @@ private:
 
     wxRearrangeCtrl *m_ctrl;
 
-    DECLARE_NO_COPY_CLASS(wxRearrangeDialog)
+    wxDECLARE_NO_COPY_CLASS(wxRearrangeDialog);
 };
 
 #endif // wxUSE_REARRANGECTRL
diff --git a/include/wx/renderer.h b/include/wx/renderer.h
index b2bb8e2eb7..fed5b7f699 100644
--- a/include/wx/renderer.h
+++ b/include/wx/renderer.h
@@ -458,7 +458,7 @@ public:
 protected:
     wxRendererNative& m_rendererNative;
 
-    DECLARE_NO_COPY_CLASS(wxDelegateRendererNative)
+    wxDECLARE_NO_COPY_CLASS(wxDelegateRendererNative);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h
index 798aeebe57..dc7b0c2ac9 100644
--- a/include/wx/richtext/richtextprint.h
+++ b/include/wx/richtext/richtextprint.h
@@ -149,7 +149,7 @@ private:
 
     wxRichTextHeaderFooterData  m_headerFooterData;
 
-    DECLARE_NO_COPY_CLASS(wxRichTextPrintout)
+    wxDECLARE_NO_COPY_CLASS(wxRichTextPrintout);
 };
 
 /*
@@ -238,7 +238,7 @@ private:
     wxRichTextBuffer*           m_richTextBufferPrinting;
     wxRect                      m_previewRect;
 
-    DECLARE_NO_COPY_CLASS(wxRichTextPrinting)
+    wxDECLARE_NO_COPY_CLASS(wxRichTextPrinting);
 };
 
 #endif  // wxUSE_RICHTEXT & wxUSE_PRINTING_ARCHITECTURE
diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h
index 3c36c49b78..739e8606ee 100644
--- a/include/wx/richtext/richtextsymboldlg.h
+++ b/include/wx/richtext/richtextsymboldlg.h
@@ -355,7 +355,7 @@ private:
     bool        m_unicodeMode;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxSymbolListCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxSymbolListCtrl);
     DECLARE_ABSTRACT_CLASS(wxSymbolListCtrl)
 };
 
diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 11e612c227..6eccefc84a 100644
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -109,7 +109,7 @@ private:
     friend class wxTCPClient;
     friend class wxTCPEventHandler;
 
-    DECLARE_NO_COPY_CLASS(wxTCPConnection)
+    wxDECLARE_NO_COPY_CLASS(wxTCPConnection);
     DECLARE_DYNAMIC_CLASS(wxTCPConnection)
 };
 
@@ -132,7 +132,7 @@ protected:
     wxString m_filename;
 #endif // __UNIX_LIKE__
 
-    DECLARE_NO_COPY_CLASS(wxTCPServer)
+    wxDECLARE_NO_COPY_CLASS(wxTCPServer);
     DECLARE_DYNAMIC_CLASS(wxTCPServer)
 };
 
diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 60fced8eb2..7018209199 100644
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -33,7 +33,7 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
 
   size_t OnSysWrite(const void *buffer, size_t bufsize);
 
-    DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream);
 };
 
 class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
@@ -52,7 +52,7 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
 
   size_t OnSysRead(void *buffer, size_t bufsize);
 
-    DECLARE_NO_COPY_CLASS(wxSocketInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxSocketInputStream);
 };
 
 class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
@@ -62,7 +62,7 @@ class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,
   wxSocketStream(wxSocketBase& s);
   virtual ~wxSocketStream();
 
-  DECLARE_NO_COPY_CLASS(wxSocketStream)
+  wxDECLARE_NO_COPY_CLASS(wxSocketStream);
 };
 
 #endif
diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 4fd9e3d064..2d01bcae4b 100644
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -56,7 +56,7 @@ public:
     bool IsNeeded() const { return GetRange() > GetThumbSize(); }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxScrollBarBase)
+    wxDECLARE_NO_COPY_CLASS(wxScrollBarBase);
 };
 
 #if defined(__WXUNIVERSAL__)
diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index af3ef755d5..f209507d5f 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -290,7 +290,7 @@ protected:
 
     wxScrollHelperEvtHandler *m_handler;
 
-    DECLARE_NO_COPY_CLASS(wxScrollHelperBase)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelperBase);
 };
 
 // this macro can be used in a wxScrollHelper-derived class to forward wxWindow
@@ -405,7 +405,7 @@ private:
     // VC++ 6 gives warning for the declaration of template member function
     // without definition
 #if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)
-    DECLARE_NO_COPY_CLASS(wxScrolled)
+    wxDECLARE_NO_COPY_CLASS(wxScrolled);
 #endif
 };
 
diff --git a/include/wx/selstore.h b/include/wx/selstore.h
index b72d10f990..f82d1ac5be 100644
--- a/include/wx/selstore.h
+++ b/include/wx/selstore.h
@@ -94,7 +94,7 @@ private:
     // the array of items whose selection state is different from default
     wxSelectedIndices m_itemsSel;
 
-    DECLARE_NO_COPY_CLASS(wxSelectionStore)
+    wxDECLARE_NO_COPY_CLASS(wxSelectionStore);
 };
 
 #endif // _WX_SELSTORE_H_
diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index d65663d1db..26a32ba3ea 100644
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -471,7 +471,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxSizerItem)
-    DECLARE_NO_COPY_CLASS(wxSizerItem)
+    wxDECLARE_NO_COPY_CLASS(wxSizerItem);
 };
 
 WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList );
@@ -838,7 +838,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxFlexGridSizer)
-    DECLARE_NO_COPY_CLASS(wxFlexGridSizer)
+    wxDECLARE_NO_COPY_CLASS(wxFlexGridSizer);
 };
 
 //---------------------------------------------------------------------------
@@ -961,7 +961,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxStaticBoxSizer)
-    DECLARE_NO_COPY_CLASS(wxStaticBoxSizer)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBoxSizer);
 };
 
 #endif // wxUSE_STATBOX
@@ -1009,7 +1009,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxStdDialogButtonSizer)
-    DECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer)
+    wxDECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer);
 };
 
 #endif // wxUSE_BUTTON
diff --git a/include/wx/slider.h b/include/wx/slider.h
index 7a92223486..eeb04a138a 100644
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -118,7 +118,7 @@ protected:
     }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxSliderBase)
+    wxDECLARE_NO_COPY_CLASS(wxSliderBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/snglinst.h b/include/wx/snglinst.h
index a060048360..a8f508aefb 100644
--- a/include/wx/snglinst.h
+++ b/include/wx/snglinst.h
@@ -57,7 +57,7 @@ private:
     // the implementation details (platform specific)
     class WXDLLIMPEXP_FWD_BASE wxSingleInstanceCheckerImpl *m_impl;
 
-    DECLARE_NO_COPY_CLASS(wxSingleInstanceChecker)
+    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceChecker);
 };
 
 #endif // wxUSE_SNGLINST_CHECKER
diff --git a/include/wx/socket.h b/include/wx/socket.h
index d7dca131b4..e6b11b1f25 100644
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -271,7 +271,7 @@ private:
     friend class wxSocketReadGuard;
     friend class wxSocketWriteGuard;
 
-    DECLARE_NO_COPY_CLASS(wxSocketBase)
+    wxDECLARE_NO_COPY_CLASS(wxSocketBase);
     DECLARE_CLASS(wxSocketBase)
 };
 
@@ -291,7 +291,7 @@ public:
 
     bool WaitForAccept(long seconds = -1, long milliseconds = 0);
 
-    DECLARE_NO_COPY_CLASS(wxSocketServer)
+    wxDECLARE_NO_COPY_CLASS(wxSocketServer);
     DECLARE_CLASS(wxSocketServer)
 };
 
@@ -330,7 +330,7 @@ private:
     int m_initialRecvBufferSize;
     int m_initialSendBufferSize;
 
-    DECLARE_NO_COPY_CLASS(wxSocketClient)
+    wxDECLARE_NO_COPY_CLASS(wxSocketClient);
     DECLARE_CLASS(wxSocketClient)
 };
 
@@ -359,7 +359,7 @@ public:
      */
 
 private:
-    DECLARE_NO_COPY_CLASS(wxDatagramSocket)
+    wxDECLARE_NO_COPY_CLASS(wxDatagramSocket);
     DECLARE_CLASS(wxDatagramSocket)
 };
 
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 94402564ea..53e84ea68f 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -65,7 +65,7 @@ protected:
     int   m_min;
     int   m_max;
 
-    DECLARE_NO_COPY_CLASS(wxSpinButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxSpinButtonBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index ea70a0c93b..489f076d81 100644
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -55,7 +55,7 @@ public:
     virtual void SetSelection(long from, long to) = 0;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxSpinCtrlBase)
+    wxDECLARE_NO_COPY_CLASS(wxSpinCtrlBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index 61ac6044d5..8b202b0045 100644
--- a/include/wx/sstream.h
+++ b/include/wx/sstream.h
@@ -47,7 +47,7 @@ private:
     // position in the stream in bytes, *not* in chars
     size_t m_pos;
 
-    DECLARE_NO_COPY_CLASS(wxStringInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxStringInputStream);
 };
 
 // ----------------------------------------------------------------------------
@@ -100,7 +100,7 @@ private:
     wxMemoryBuffer m_unconv;
 #endif // wxUSE_UNICODE_WCHAR
 
-    DECLARE_NO_COPY_CLASS(wxStringOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxStringOutputStream);
 };
 
 #endif // wxUSE_STREAMS
diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 9278aa0974..ec229a8329 100644
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -50,7 +50,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase);
 };
 
 #if defined(__WXUNIVERSAL__)
diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 203790654a..2b3683d3d7 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -50,7 +50,7 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
-    DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);
 };
 
 #if defined(__WXUNIVERSAL__)
diff --git a/include/wx/statline.h b/include/wx/statline.h
index 9cdd7ffd2e..3894169118 100644
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -76,7 +76,7 @@ protected:
         return AdjustSize(wxDefaultSize);
     }
 
-    DECLARE_NO_COPY_CLASS(wxStaticLineBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticLineBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 73c1c93fc5..f8d7ede736 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -94,7 +94,7 @@ protected:      // functions required for wxST_ELLIPSIZE_* support
     virtual void DoSetLabel(const wxString& WXUNUSED(str)) { }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxStaticTextBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticTextBase);
 };
 
 // see wx/generic/stattextg.h for the explanation
diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index a5593c27cf..49ae99e24e 100644
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -130,7 +130,7 @@ protected:
     // if true overrides the width info of the wxStatusBarPanes
     bool m_bSameWidthForAllPanes;
 
-    DECLARE_NO_COPY_CLASS(wxStatusBarBase)
+    wxDECLARE_NO_COPY_CLASS(wxStatusBarBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 74e871324b..cf538d1491 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -240,7 +240,7 @@ private:
     // the conversion object we forward to
     wxMBConv *m_conv;
 
-    DECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames)
+    wxDECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames);
 };
 
 #endif // __UNIX__
diff --git a/include/wx/stream.h b/include/wx/stream.h
index 3f34c95212..c2cb838f92 100644
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -83,7 +83,7 @@ protected:
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxStreamBase)
-    DECLARE_NO_COPY_CLASS(wxStreamBase)
+    wxDECLARE_NO_COPY_CLASS(wxStreamBase);
 };
 
 // ----------------------------------------------------------------------------
@@ -218,7 +218,7 @@ protected:
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxInputStream)
-    DECLARE_NO_COPY_CLASS(wxInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxInputStream);
 };
 
 // ----------------------------------------------------------------------------
@@ -254,7 +254,7 @@ protected:
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxOutputStream)
-    DECLARE_NO_COPY_CLASS(wxOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxOutputStream);
 };
 
 // ============================================================================
@@ -282,7 +282,7 @@ protected:
     size_t m_currentPos;
 
     DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
-    DECLARE_NO_COPY_CLASS(wxCountingOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream);
 };
 
 // ---------------------------------------------------------------------------
@@ -308,7 +308,7 @@ protected:
     bool m_owns;
 
     DECLARE_ABSTRACT_CLASS(wxFilterInputStream)
-    DECLARE_NO_COPY_CLASS(wxFilterInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFilterInputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream
@@ -330,7 +330,7 @@ protected:
     bool m_owns;
 
     DECLARE_ABSTRACT_CLASS(wxFilterOutputStream)
-    DECLARE_NO_COPY_CLASS(wxFilterOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFilterOutputStream);
 };
 
 enum wxStreamProtocolType
@@ -530,7 +530,7 @@ protected:
          m_flushable;
 
 
-    DECLARE_NO_ASSIGN_CLASS(wxStreamBuffer)
+    wxDECLARE_NO_ASSIGN_CLASS(wxStreamBuffer);
 };
 
 // ---------------------------------------------------------------------------
@@ -579,7 +579,7 @@ protected:
 
     wxStreamBuffer *m_i_streambuf;
 
-    DECLARE_NO_COPY_CLASS(wxBufferedInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxBufferedInputStream);
 };
 
 // ----------------------------------------------------------------------------
@@ -631,7 +631,7 @@ protected:
 
     wxStreamBuffer *m_o_streambuf;
 
-    DECLARE_NO_COPY_CLASS(wxBufferedOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxBufferedOutputStream);
 };
 
 #if WXWIN_COMPATIBILITY_2_6
diff --git a/include/wx/string.h b/include/wx/string.h
index 22e0ec6f5e..b6cb7836b3 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -426,7 +426,7 @@ private:
 
     // the node belongs to a particular iterator instance, it's not copied
     // when a copy of the iterator is made
-    DECLARE_NO_COPY_CLASS(wxStringIteratorNode)
+    wxDECLARE_NO_COPY_CLASS(wxStringIteratorNode);
 };
 #endif // wxUSE_UNICODE_UTF8
 
@@ -3428,7 +3428,7 @@ private:
 
       // copying is disallowed as it would result in more than one pointer into
       // the same linked list
-      DECLARE_NO_COPY_CLASS(wxStringIteratorNodeHead)
+      wxDECLARE_NO_COPY_CLASS(wxStringIteratorNodeHead);
   };
 
   wxStringIteratorNodeHead m_iterators;
@@ -3571,7 +3571,7 @@ private:
     wxString&         m_str;
     wxStringCharType *m_buf;
 
-    DECLARE_NO_COPY_CLASS(wxStringInternalBuffer)
+    wxDECLARE_NO_COPY_CLASS(wxStringInternalBuffer);
 };
 
 class wxStringInternalBufferLength
@@ -3601,7 +3601,7 @@ private:
     size_t            m_len;
     bool              m_lenSet;
 
-    DECLARE_NO_COPY_CLASS(wxStringInternalBufferLength)
+    wxDECLARE_NO_COPY_CLASS(wxStringInternalBufferLength);
 };
 
 #endif // !wxUSE_STL_BASED_WXSTRING
@@ -3681,7 +3681,7 @@ public:
         this->m_str.assign(this->m_buf.data());
     }
 
-    DECLARE_NO_COPY_CLASS(wxStringTypeBuffer)
+    wxDECLARE_NO_COPY_CLASS(wxStringTypeBuffer);
 };
 
 template
@@ -3697,7 +3697,7 @@ public:
         this->m_str.assign(this->m_buf.data(), this->m_len);
     }
 
-    DECLARE_NO_COPY_CLASS(wxStringTypeBufferLength)
+    wxDECLARE_NO_COPY_CLASS(wxStringTypeBufferLength);
 };
 
 #if wxUSE_STL_BASED_WXSTRING
@@ -3712,7 +3712,7 @@ public:
     ~wxStringInternalBuffer()
         { m_str.m_impl.assign(m_buf.data()); }
 
-    DECLARE_NO_COPY_CLASS(wxStringInternalBuffer)
+    wxDECLARE_NO_COPY_CLASS(wxStringInternalBuffer);
 };
 
 WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE(
@@ -3730,7 +3730,7 @@ public:
         m_str.m_impl.assign(m_buf.data(), m_len);
     }
 
-    DECLARE_NO_COPY_CLASS(wxStringInternalBufferLength)
+    wxDECLARE_NO_COPY_CLASS(wxStringInternalBufferLength);
 };
 
 #endif // wxUSE_STL_BASED_WXSTRING
@@ -3780,7 +3780,7 @@ public:
         conv.ToWChar(wbuf, wlen, m_buf);
     }
 
-    DECLARE_NO_COPY_CLASS(wxUTF8StringBuffer)
+    wxDECLARE_NO_COPY_CLASS(wxUTF8StringBuffer);
 };
 
 WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxStringTypeBufferLengthBase )
@@ -3803,7 +3803,7 @@ public:
         wbuf.SetLength(wlen);
     }
 
-    DECLARE_NO_COPY_CLASS(wxUTF8StringBufferLength)
+    wxDECLARE_NO_COPY_CLASS(wxUTF8StringBufferLength);
 };
 #endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR
 
diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h
index ed16e5ed90..e81a083a61 100644
--- a/include/wx/strvararg.h
+++ b/include/wx/strvararg.h
@@ -191,7 +191,7 @@ private:
     const wxString * const m_str;
     const wxCStrData * const m_cstr;
 
-    DECLARE_NO_ASSIGN_CLASS(wxFormatString)
+    wxDECLARE_NO_ASSIGN_CLASS(wxFormatString);
 };
 
 // these two helper classes are used to find wxFormatString argument among fixed
diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index 5043c5f29e..44087ccabd 100644
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -200,7 +200,7 @@ private:
     wxTarHeaderRecords *m_HeaderRecs;
     wxTarHeaderRecords *m_GlobalHeaderRecs;
 
-    DECLARE_NO_COPY_CLASS(wxTarInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTarInputStream);
 };
 
 
@@ -283,7 +283,7 @@ private:
     wxString m_badfit;
     bool m_endrecWritten;
 
-    DECLARE_NO_COPY_CLASS(wxTarOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTarOutputStream);
 };
 
 
diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index b67607bbe4..8c789f09f4 100644
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -53,7 +53,7 @@ private:
     void OnRightButtonDown(wxTaskBarIconEvent& event);
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTaskBarIconBase)
+    wxDECLARE_NO_COPY_CLASS(wxTaskBarIconBase);
 };
 
 
@@ -89,7 +89,7 @@ public:
     virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
 
 private:
-    DECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent)
+    wxDECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent);
 };
 
 typedef void (wxEvtHandler::*wxTaskBarIconEventFunction)(wxTaskBarIconEvent&);
diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index fc09d46586..d13bf22333 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -622,7 +622,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxToolBarBase)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarBase);
 };
 
 // deprecated function for creating the image for disabled buttons, use
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index b515d9e866..c1fb770632 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -597,7 +597,7 @@ protected:
     wxTextAttr m_defaultStyle;
 
 
-    DECLARE_NO_COPY_CLASS(wxTextAreaBase)
+    wxDECLARE_NO_COPY_CLASS(wxTextAreaBase);
 };
 
 // this class defines wxTextCtrl interface, wxTextCtrlBase actually implements
@@ -612,7 +612,7 @@ public:
     wxTextCtrlIface() { }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxTextCtrlIface)
+    wxDECLARE_NO_COPY_CLASS(wxTextCtrlIface);
 };
 
 // ----------------------------------------------------------------------------
@@ -693,7 +693,7 @@ protected:
     virtual bool DoSaveFile(const wxString& file, int fileType);
 
 
-    DECLARE_NO_COPY_CLASS(wxTextCtrlBase)
+    wxDECLARE_NO_COPY_CLASS(wxTextCtrlBase);
     DECLARE_ABSTRACT_CLASS(wxTextCtrlBase)
 };
 
diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index 588aedd24a..240817cfe2 100644
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -46,7 +46,7 @@ private:
 
     wxFile m_file;
 
-    DECLARE_NO_COPY_CLASS(wxTextFile)
+    wxDECLARE_NO_COPY_CLASS(wxTextFile);
 };
 
 #else // !wxUSE_TEXTFILE
diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 614a4ed0b9..d7546f1f44 100644
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -65,7 +65,7 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
-    DECLARE_NO_COPY_CLASS(wxToggleButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxToggleButtonBase);
 };
 
 
diff --git a/include/wx/thread.h b/include/wx/thread.h
index 999d4f9166..fc0ac2759c 100644
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -161,7 +161,7 @@ protected:
 
     friend class wxConditionInternal;
 
-    DECLARE_NO_COPY_CLASS(wxMutex)
+    wxDECLARE_NO_COPY_CLASS(wxMutex);
 };
 
 // a helper class which locks the mutex in the ctor and unlocks it in the dtor:
@@ -266,7 +266,7 @@ private:
     };
 #endif // Unix&OS2/Win32
 
-    DECLARE_NO_COPY_CLASS(wxCriticalSection)
+    wxDECLARE_NO_COPY_CLASS(wxCriticalSection);
 };
 
 #if wxCRITSECT_IS_MUTEX
@@ -301,7 +301,7 @@ public:
 private:
     wxCriticalSection& m_critsect;
 
-    DECLARE_NO_COPY_CLASS(wxCriticalSectionLocker)
+    wxDECLARE_NO_COPY_CLASS(wxCriticalSectionLocker);
 };
 
 // ----------------------------------------------------------------------------
@@ -364,7 +364,7 @@ public:
 private:
     wxConditionInternal *m_internal;
 
-    DECLARE_NO_COPY_CLASS(wxCondition)
+    wxDECLARE_NO_COPY_CLASS(wxCondition);
 };
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -409,7 +409,7 @@ public:
 private:
     wxSemaphoreInternal *m_internal;
 
-    DECLARE_NO_COPY_CLASS(wxSemaphore)
+    wxDECLARE_NO_COPY_CLASS(wxSemaphore);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp
index 71942ba27d..6664ce7ee4 100644
--- a/include/wx/thrimpl.cpp
+++ b/include/wx/thrimpl.cpp
@@ -101,7 +101,7 @@ private:
     wxMutex& m_mutex;
     wxSemaphore m_semaphore;
 
-    DECLARE_NO_COPY_CLASS(wxConditionInternal)
+    wxDECLARE_NO_COPY_CLASS(wxConditionInternal);
 };
 
 wxConditionInternal::wxConditionInternal(wxMutex& mutex)
diff --git a/include/wx/timer.h b/include/wx/timer.h
index 21f8ece1ed..0b9a63b082 100644
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -113,7 +113,7 @@ protected:
 
     wxTimerImpl *m_impl;
 
-    DECLARE_NO_COPY_CLASS(wxTimer)
+    wxDECLARE_NO_COPY_CLASS(wxTimer);
 };
 
 // ----------------------------------------------------------------------------
@@ -146,7 +146,7 @@ public:
 private:
     wxTimer& m_timer;
 
-    DECLARE_NO_COPY_CLASS(wxTimerRunner)
+    wxDECLARE_NO_COPY_CLASS(wxTimerRunner);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index 6b448ec101..a805fc6b66 100644
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -90,7 +90,7 @@ private:
 
     friend class wxTipWindowView;
 
-    DECLARE_NO_COPY_CLASS(wxTipWindow)
+    wxDECLARE_NO_COPY_CLASS(wxTipWindow);
 };
 
 #endif // wxUSE_TIPWINDOW
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 2421a6eb23..c8bd227475 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -299,7 +299,7 @@ protected:
     // a temporary override of m_winDefault, use the latter if NULL
     wxWindowRef m_winTmpDefault;
 
-    DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
+    wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowBase);
     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();
 };
diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 77a10793c7..81e24a8e8c 100644
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -438,7 +438,7 @@ protected:
     bool        m_quickBestSize;
 
 
-    DECLARE_NO_COPY_CLASS(wxTreeCtrlBase)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index 0c3983799c..d9d3399415 100644
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -93,7 +93,7 @@ protected:
     wxChar NextChar();   // this should be used instead of GetC() because of Unicode issues
     wxChar NextNonSeparators();
 
-    DECLARE_NO_COPY_CLASS(wxTextInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTextInputStream);
 };
 
 typedef enum
@@ -151,7 +151,7 @@ protected:
     wxMBConv *m_conv;
 #endif
 
-    DECLARE_NO_COPY_CLASS(wxTextOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTextOutputStream);
 };
 
 #endif
diff --git a/include/wx/univ/stdrend.h b/include/wx/univ/stdrend.h
index a6be61336d..2fd6a5e351 100644
--- a/include/wx/univ/stdrend.h
+++ b/include/wx/univ/stdrend.h
@@ -347,7 +347,7 @@ protected:
     // update m_penXXX objects above
     const wxColourScheme * const m_scheme;
 
-    DECLARE_NO_COPY_CLASS(wxStdRenderer)
+    wxDECLARE_NO_COPY_CLASS(wxStdRenderer);
 };
 
 #endif // _WX_UNIV_STDREND_H_
diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h
index ab5a5f9a40..42d16625a9 100644
--- a/include/wx/unix/evtloop.h
+++ b/include/wx/unix/evtloop.h
@@ -49,7 +49,7 @@ private:
     // either wxSelectDispatcher or wxEpollDispatcher
     wxFDIODispatcher *m_dispatcher;
 
-    DECLARE_NO_COPY_CLASS(wxConsoleEventLoop)
+    wxDECLARE_NO_COPY_CLASS(wxConsoleEventLoop);
 };
 
 #endif // wxUSE_CONSOLE_EVENTLOOP
diff --git a/include/wx/unix/tls.h b/include/wx/unix/tls.h
index 5f5744c164..126ccd2b17 100644
--- a/include/wx/unix/tls.h
+++ b/include/wx/unix/tls.h
@@ -54,7 +54,7 @@ public:
 private:
     pthread_key_t m_key;
 
-    DECLARE_NO_COPY_CLASS(wxTlsKey)
+    wxDECLARE_NO_COPY_CLASS(wxTlsKey);
 };
 
 #endif // _WX_UNIX_TLS_H_
diff --git a/include/wx/utils.h b/include/wx/utils.h
index 3d50a61ad0..6f6ad149c6 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -634,7 +634,7 @@ private:
     wxWindowList *m_winDisabled;
     bool m_disabled;
 
-    DECLARE_NO_COPY_CLASS(wxWindowDisabler)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDisabler);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index d3bf35d7b3..63324a1962 100644
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -76,7 +76,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxGenericValidator)
-    DECLARE_NO_ASSIGN_CLASS(wxGenericValidator)
+    wxDECLARE_NO_ASSIGN_CLASS(wxGenericValidator);
 };
 
 #endif // wxUSE_VALIDATORS
diff --git a/include/wx/validate.h b/include/wx/validate.h
index 353dc85dfe..55005f9d87 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -74,7 +74,7 @@ private:
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)
-    DECLARE_NO_COPY_CLASS(wxValidator)
+    wxDECLARE_NO_COPY_CLASS(wxValidator);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 955a7f38f8..34efdbea5a 100644
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -98,7 +98,7 @@ protected:
     wxArrayString        m_excludes;
 
 private:
-    DECLARE_NO_ASSIGN_CLASS(wxTextValidator)
+    wxDECLARE_NO_ASSIGN_CLASS(wxTextValidator);
     DECLARE_DYNAMIC_CLASS(wxTextValidator)
     DECLARE_EVENT_TABLE()
 };
diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index 6ba94b4273..9556033827 100644
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -304,7 +304,7 @@ private:
     wxColour m_colBgSel;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxVListBox)
+    wxDECLARE_NO_COPY_CLASS(wxVListBox);
     DECLARE_ABSTRACT_CLASS(wxVListBox)
 };
 
diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index e80c42cd7b..d2ebbdc508 100644
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -736,7 +736,7 @@ protected:
 #endif // __WXMAC__
 
 private:
-    DECLARE_NO_COPY_CLASS(wxVScrolledWindow)
+    wxDECLARE_NO_COPY_CLASS(wxVScrolledWindow);
     DECLARE_ABSTRACT_CLASS(wxVScrolledWindow)
 };
 
@@ -803,7 +803,7 @@ protected:
 #endif // __WXMAC__
 
 private:
-    DECLARE_NO_COPY_CLASS(wxHScrolledWindow)
+    wxDECLARE_NO_COPY_CLASS(wxHScrolledWindow);
     DECLARE_ABSTRACT_CLASS(wxHScrolledWindow)
 };
 
@@ -868,7 +868,7 @@ protected:
 #endif // __WXMAC__
 
 private:
-    DECLARE_NO_COPY_CLASS(wxHVScrolledWindow)
+    wxDECLARE_NO_COPY_CLASS(wxHVScrolledWindow);
     DECLARE_ABSTRACT_CLASS(wxHVScrolledWindow)
 };
 
diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index da1e7c2d87..9a2fa60ba7 100644
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -53,7 +53,7 @@ protected:
     wxFile *m_file;
     bool m_file_destroy;
 
-    DECLARE_NO_COPY_CLASS(wxFileInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileInputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFileOutputStream : public wxOutputStream
@@ -83,7 +83,7 @@ protected:
     wxFile *m_file;
     bool m_file_destroy;
 
-    DECLARE_NO_COPY_CLASS(wxFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileOutputStream);
 };
 
 class WXDLLIMPEXP_BASE wxTempFileOutputStream : public wxOutputStream
@@ -108,7 +108,7 @@ protected:
 private:
     wxTempFile *m_file;
 
-    DECLARE_NO_COPY_CLASS(wxTempFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTempFileOutputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
@@ -119,7 +119,7 @@ public:
     virtual bool IsOk() const;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxFileStream)
+    wxDECLARE_NO_COPY_CLASS(wxFileStream);
 };
 
 #endif //wxUSE_FILE
@@ -155,7 +155,7 @@ protected:
     wxFFile *m_file;
     bool m_file_destroy;
 
-    DECLARE_NO_COPY_CLASS(wxFFileInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileInputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
@@ -185,7 +185,7 @@ protected:
     wxFFile *m_file;
     bool m_file_destroy;
 
-    DECLARE_NO_COPY_CLASS(wxFFileOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileOutputStream);
 };
 
 class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
@@ -196,7 +196,7 @@ public:
     virtual bool IsOk() const;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxFFileStream)
+    wxDECLARE_NO_COPY_CLASS(wxFFileStream);
 };
 
 #endif //wxUSE_FFILE
diff --git a/include/wx/window.h b/include/wx/window.h
index 06d52fc835..cc879cfd98 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1703,7 +1703,7 @@ private:
 
 
     DECLARE_ABSTRACT_CLASS(wxWindowBase)
-    DECLARE_NO_COPY_CLASS(wxWindowBase)
+    wxDECLARE_NO_COPY_CLASS(wxWindowBase);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 494dc49389..e0d2296a8a 100644
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -244,7 +244,7 @@ public:
     bool Validate() { return true; }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxWizardBase)
+    wxDECLARE_NO_COPY_CLASS(wxWizardBase);
 };
 
 // include the real class declaration
diff --git a/include/wx/wupdlock.h b/include/wx/wupdlock.h
index cc1b423e9e..0c1b71022d 100644
--- a/include/wx/wupdlock.h
+++ b/include/wx/wupdlock.h
@@ -30,7 +30,7 @@ public:
 private:
     wxWindow *m_win;
 
-    DECLARE_NO_COPY_CLASS(wxWindowUpdateLocker)
+    wxDECLARE_NO_COPY_CLASS(wxWindowUpdateLocker);
 };
 
 #endif // _WX_WUPDLOCK_H_
diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index a4353eaf9d..a958feb093 100644
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -190,7 +190,7 @@ private:
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindowX11)
-    DECLARE_NO_COPY_CLASS(wxWindowX11)
+    wxDECLARE_NO_COPY_CLASS(wxWindowX11);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index c0d5d4f84b..64b6e53a17 100644
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -116,7 +116,7 @@ private:
     // doesn't give us any means to copy a _locale_t object so we reduce the
     // functionality to least common denominator here -- it shouldn't be a
     // problem as copying the locale objects shouldn't be often needed
-    DECLARE_NO_COPY_CLASS(wxXLocale)
+    wxDECLARE_NO_COPY_CLASS(wxXLocale);
 };
 
 #else // !wxHAS_XLOCALE_SUPPORT
@@ -169,7 +169,7 @@ private:
     // although it's not a problem to copy the objects of this class, we use
     // this macro in this implementation for consistency with the xlocale-based
     // one which can't be copied when using MSVC locale API
-    DECLARE_NO_COPY_CLASS(wxXLocale)
+    wxDECLARE_NO_COPY_CLASS(wxXLocale);
 };
 
 #endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT
diff --git a/include/wx/xti.h b/include/wx/xti.h
index 41c24517f7..ad53a5d129 100644
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -1826,7 +1826,7 @@ protected:
     void Register();
     void Unregister();
 
-    DECLARE_NO_COPY_CLASS(wxClassInfo)
+    wxDECLARE_NO_COPY_CLASS(wxClassInfo);
 };
 
 
diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 5d3d67530d..618403f95c 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -348,7 +348,7 @@ private:
     wxString m_Comment;
     bool m_endrecWritten;
 
-    DECLARE_NO_COPY_CLASS(wxZipOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxZipOutputStream);
 };
 
 
@@ -446,7 +446,7 @@ private:
     friend class wxArchiveFSHandler;
 #endif
 
-    DECLARE_NO_COPY_CLASS(wxZipInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxZipInputStream);
 };
 
 
diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index d6c473080b..ae7e4124fa 100644
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -57,7 +57,7 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
   struct z_stream_s *m_inflate;
   wxFileOffset m_pos;
 
-  DECLARE_NO_COPY_CLASS(wxZlibInputStream)
+  wxDECLARE_NO_COPY_CLASS(wxZlibInputStream);
 };
 
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
@@ -87,7 +87,7 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
   struct z_stream_s *m_deflate;
   wxFileOffset m_pos;
 
-  DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
+  wxDECLARE_NO_COPY_CLASS(wxZlibOutputStream);
 };
 
 class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory
diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index 77c1148ce7..63e815802b 100644
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -927,9 +927,9 @@ typedef double wxDouble;
     In such case, this macro can be used to disable the automatic assignment
     operator generation.
 
-    @see DECLARE_NO_COPY_CLASS()
+    @see wxDECLARE_NO_COPY_CLASS()
  */
-#define DECLARE_NO_ASSIGN_CLASS(classname)
+#define wxDECLARE_NO_ASSIGN_CLASS(classname)
 
 /**
     This macro can be used in a class declaration to disable the generation of
@@ -954,27 +954,29 @@ typedef double wxDouble;
 
     private:
         // widgets can't be copied
-        DECLARE_NO_COPY_CLASS(FooWidget)
+        wxDECLARE_NO_COPY_CLASS(FooWidget);
     };
     @endcode
 
-    Notice that a semicolon should not be used after this macro and that it
-    changes the access specifier to private internally so it is better to use
-    it at the end of the class declaration.
+    Notice that a semicolon must be used after this macro and that it changes
+    the access specifier to private internally so it is better to use it at the
+    end of the class declaration.
+
+    @see wxDECLARE_NO_ASSIGN_CLASS(), wxDECLARE_NO_COPY_TEMPLATE_CLASS()
  */
-#define DECLARE_NO_COPY_CLASS(classname)
+#define wxDECLARE_NO_COPY_CLASS(classname)
 
 /**
-    Equivalent of DECLARE_NO_COPY_CLASS() for template classes.
+    Analog of wxDECLARE_NO_COPY_CLASS() for template classes.
 
     This macro can be used for template classes (with a single template
-    parameter) for the same purpose as DECLARE_NO_COPY_CLASS() is used with the
+    parameter) for the same purpose as wxDECLARE_NO_COPY_CLASS() is used with the
     non-template classes.
 
     @param classname The name of the template class.
     @param arg The name of the template parameter.
  */
-#define DECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg)
+#define wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg)
 
 /**
     A function which deletes and nulls the pointer.
diff --git a/samples/collpane/collpane.cpp b/samples/collpane/collpane.cpp
index 0e3d76e487..443ed90f72 100644
--- a/samples/collpane/collpane.cpp
+++ b/samples/collpane/collpane.cpp
@@ -78,7 +78,7 @@ public:
 
     virtual bool OnInit();
 
-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
 class MyFrame: public wxFrame
@@ -104,7 +104,7 @@ private:
     wxBoxSizer *m_paneSizer;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MyFrame)
+    wxDECLARE_NO_COPY_CLASS(MyFrame);
 };
 
 class MyDialog : public wxDialog
@@ -120,7 +120,7 @@ private:
     wxGridSizer *m_paneSizer;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MyDialog)
+    wxDECLARE_NO_COPY_CLASS(MyDialog);
 };
 
 
diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp
index 15133706cf..61f58a1394 100644
--- a/samples/debugrpt/debugrpt.cpp
+++ b/samples/debugrpt/debugrpt.cpp
@@ -169,7 +169,7 @@ private:
     // number of lines drawn in OnPaint()
     int m_numLines;
 
-    DECLARE_NO_COPY_CLASS(MyFrame)
+    wxDECLARE_NO_COPY_CLASS(MyFrame);
     DECLARE_EVENT_TABLE()
 };
 
@@ -204,7 +204,7 @@ public:
 private:
     bool m_uploadReport;
 
-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
 IMPLEMENT_APP(MyApp)
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 15f1d8964a..59197b7642 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -980,7 +980,7 @@ private:
     wxTextCtrl *m_text;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MyRearrangeDialog)
+    wxDECLARE_NO_COPY_CLASS(MyRearrangeDialog);
 };
 
 BEGIN_EVENT_TABLE(MyRearrangeDialog, wxRearrangeDialog)
diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 19605e1a2c..52630093d1 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -228,7 +228,7 @@ private:
                *m_chkCentre;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(TestMessageBoxDialog)
+    wxDECLARE_NO_COPY_CLASS(TestMessageBoxDialog);
 };
 
 class TestDefaultActionDialog: public wxDialog
diff --git a/samples/docview/doc.h b/samples/docview/doc.h
index 280f1656c0..8365009d5c 100644
--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -173,7 +173,7 @@ protected:
     virtual bool DoSaveDocument(const wxString& filename);
     virtual bool DoOpenDocument(const wxString& filename);
 
-    DECLARE_NO_COPY_CLASS(wxTextDocument)
+    wxDECLARE_NO_COPY_CLASS(wxTextDocument);
     DECLARE_CLASS(wxTextDocument)
 };
 
@@ -187,7 +187,7 @@ public:
     TextEditDocument() : wxTextDocument() { }
     virtual wxTextCtrl* GetTextCtrl() const;
 
-    DECLARE_NO_COPY_CLASS(TextEditDocument)
+    wxDECLARE_NO_COPY_CLASS(TextEditDocument);
     DECLARE_DYNAMIC_CLASS(TextEditDocument)
 };
 
diff --git a/samples/docview/docview.h b/samples/docview/docview.h
index 81357a0a30..c3b91f3d4b 100644
--- a/samples/docview/docview.h
+++ b/samples/docview/docview.h
@@ -80,7 +80,7 @@ private:
     wxMenu *m_menuEdit;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
 DECLARE_APP(MyApp)
diff --git a/samples/flash/flash.cpp b/samples/flash/flash.cpp
index e0467ef5b9..b0dc87bedc 100644
--- a/samples/flash/flash.cpp
+++ b/samples/flash/flash.cpp
@@ -120,7 +120,7 @@ public:
 private:
     wxString m_swf;
 
-    DECLARE_NO_COPY_CLASS(FlashApp)
+    wxDECLARE_NO_COPY_CLASS(FlashApp);
 };
 
 // Define a new frame type: this is going to be our main frame
@@ -187,7 +187,7 @@ private:
                *m_funcarg;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(FlashFrame)
+    wxDECLARE_NO_COPY_CLASS(FlashFrame);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index 5472db618d..f796fbd2f4 100644
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -1877,7 +1877,7 @@ private:
     // fla for EVT_IDLE handler
     bool m_shouldUpdateOrder;
 
-    DECLARE_NO_COPY_CLASS(TabularGridFrame)
+    wxDECLARE_NO_COPY_CLASS(TabularGridFrame);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index eb4ccdb014..41817204c7 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -95,7 +95,7 @@ public:
     wxTextFile m_file;
 #endif
 
-    DECLARE_NO_COPY_CLASS(MyHtmlListBox)
+    wxDECLARE_NO_COPY_CLASS(MyHtmlListBox);
     DECLARE_DYNAMIC_CLASS(MyHtmlListBox)
 };
 
diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 176bc81b42..a0655c2d84 100644
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -60,7 +60,7 @@ private:
 #if wxUSE_CLIPBOARD
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_CLIPBOARD
-    DECLARE_NO_COPY_CLASS(MyHtmlWindow)
+    wxDECLARE_NO_COPY_CLASS(MyHtmlWindow);
 };
 
 // Define a new frame type: this is going to be our main frame
diff --git a/samples/ipc/baseserver.cpp b/samples/ipc/baseserver.cpp
index 80581e5760..4d8025fedb 100644
--- a/samples/ipc/baseserver.cpp
+++ b/samples/ipc/baseserver.cpp
@@ -104,7 +104,7 @@ private:
     // should we notify the client about changes to m_item?
     bool m_advise;
 
-    DECLARE_NO_COPY_CLASS(BenchConnection)
+    wxDECLARE_NO_COPY_CLASS(BenchConnection);
 };
 
 // a simple server accepting connections to IPC_TOPIC and IPC_BENCHMARK_TOPIC
diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index 26e1c6cf07..f21382594d 100644
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -26,7 +26,7 @@ public:
     virtual bool OnInit();
 
 private:
-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
 class MyListCtrl: public wxListCtrl
@@ -93,7 +93,7 @@ private:
     long m_updated;
 
 
-    DECLARE_NO_COPY_CLASS(MyListCtrl)
+    wxDECLARE_NO_COPY_CLASS(MyListCtrl);
     DECLARE_EVENT_TABLE()
 };
 
@@ -175,7 +175,7 @@ private:
 
     bool m_smallVirtual;
 
-    DECLARE_NO_COPY_CLASS(MyFrame)
+    wxDECLARE_NO_COPY_CLASS(MyFrame);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/samples/opengl/isosurf/isosurf.h b/samples/opengl/isosurf/isosurf.h
index f1f7519fc8..75e6c48d52 100644
--- a/samples/opengl/isosurf/isosurf.h
+++ b/samples/opengl/isosurf/isosurf.h
@@ -70,7 +70,7 @@ private:
     GLfloat m_xrot;
     GLfloat m_yrot;
 
-    DECLARE_NO_COPY_CLASS(TestGLCanvas)
+    wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h
index b5aae0eea1..3f25590907 100644
--- a/samples/opengl/penguin/penguin.h
+++ b/samples/opengl/penguin/penguin.h
@@ -100,7 +100,7 @@ private:
     GLData       m_gldata;
     DXFRenderer  m_renderer;
 
-    DECLARE_NO_COPY_CLASS(TestGLCanvas)
+    wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index b57cb61979..a25419d30e 100644
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -74,7 +74,7 @@ public:
 
     virtual bool OnInit();
 
-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
 class MyFrame: public wxFrame
@@ -114,7 +114,7 @@ private:
     wxWindow *m_replacewindow;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MyFrame)
+    wxDECLARE_NO_COPY_CLASS(MyFrame);
 };
 
 class MySplitterWindow : public wxSplitterWindow
@@ -132,7 +132,7 @@ private:
     wxFrame *m_frame;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MySplitterWindow)
+    wxDECLARE_NO_COPY_CLASS(MySplitterWindow);
 };
 
 class MyCanvas: public wxScrolledWindow
@@ -146,7 +146,7 @@ public:
 private:
     bool m_mirror;
 
-    DECLARE_NO_COPY_CLASS(MyCanvas)
+    wxDECLARE_NO_COPY_CLASS(MyCanvas);
 };
 
 // ============================================================================
diff --git a/samples/widgets/itemcontainer.cpp b/samples/widgets/itemcontainer.cpp
index f8517a5374..5b70076292 100644
--- a/samples/widgets/itemcontainer.cpp
+++ b/samples/widgets/itemcontainer.cpp
@@ -59,7 +59,7 @@ private:
     ItemContainerWidgetsPage *m_tracker;
     int m_value;
 
-    DECLARE_NO_COPY_CLASS(TrackedClientData)
+    wxDECLARE_NO_COPY_CLASS(TrackedClientData);
 };
 
 // ============================================================================
diff --git a/src/cocoa/display.mm b/src/cocoa/display.mm
index 3e375d45c9..b9135addd5 100644
--- a/src/cocoa/display.mm
+++ b/src/cocoa/display.mm
@@ -53,7 +53,7 @@ public:
 private:
     CGDirectDisplayID m_id;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImplMacOSX)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplMacOSX);
 };
 
 class wxDisplayFactoryMacOSX : public wxDisplayFactory
@@ -66,7 +66,7 @@ public:
     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:
-    DECLARE_NO_COPY_CLASS(wxDisplayFactoryMacOSX)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryMacOSX);
 };
 
 // ============================================================================
diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 3cee0cb9b7..fe1ea122e1 100644
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -152,7 +152,7 @@ namespace { // file namespace
 
 class wxCocoaPrivateScreenCoordinateTransformer
 {
-    DECLARE_NO_COPY_CLASS(wxCocoaPrivateScreenCoordinateTransformer)
+    wxDECLARE_NO_COPY_CLASS(wxCocoaPrivateScreenCoordinateTransformer);
 public:
     wxCocoaPrivateScreenCoordinateTransformer();
     ~wxCocoaPrivateScreenCoordinateTransformer();
@@ -273,7 +273,7 @@ NSPoint wxWindowCocoa::OriginInCocoaScreenCoordinatesForRectInWxDisplayCoordinat
 // ========================================================================
 class wxWindowCocoaHider: protected wxCocoaNSView
 {
-    DECLARE_NO_COPY_CLASS(wxWindowCocoaHider)
+    wxDECLARE_NO_COPY_CLASS(wxWindowCocoaHider);
 public:
     wxWindowCocoaHider(wxWindow *owner);
     virtual ~wxWindowCocoaHider();
@@ -1817,7 +1817,7 @@ static char const * const comparisonresultStrings[] =
 
 class CocoaWindowCompareContext
 {
-    DECLARE_NO_COPY_CLASS(CocoaWindowCompareContext)
+    wxDECLARE_NO_COPY_CLASS(CocoaWindowCompareContext);
 public:
     CocoaWindowCompareContext(); // Not implemented
     CocoaWindowCompareContext(NSView *target, NSArray *subviews)
@@ -2008,7 +2008,7 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt)
  */
 class wxCocoaMouseMovedEventSynthesizer
 {
-    DECLARE_NO_COPY_CLASS(wxCocoaMouseMovedEventSynthesizer)
+    wxDECLARE_NO_COPY_CLASS(wxCocoaMouseMovedEventSynthesizer);
 public:
     wxCocoaMouseMovedEventSynthesizer()
     {   m_lastScreenMouseLocation = NSZeroPoint;
diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index de5c452177..60b613b8a6 100644
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -58,7 +58,7 @@ public:
 //// Data
     wxContextHelp* m_contextHelp;
 
-    DECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler);
 };
 
 // ============================================================================
diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 8b5b453db0..eab16e5bd8 100644
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -214,7 +214,7 @@ public:
 private:
     wxArrayString& m_files;
 
-    DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserSimple);
 };
 
 /* static */
@@ -266,7 +266,7 @@ public:
 private:
     wxString m_file;
 
-    DECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst);
 };
 
 /* static */
diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index f8dcb43e85..3c337d10bb 100644
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -85,7 +85,7 @@ public:
 #endif // wxUSE_DISPLAY
 
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImplSingle)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplSingle);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/execcmn.cpp b/src/common/execcmn.cpp
index 61bb0e2d04..2751344295 100644
--- a/src/common/execcmn.cpp
+++ b/src/common/execcmn.cpp
@@ -68,7 +68,7 @@ private:
     // the size of the buffer
     size_t m_size;
 
-    DECLARE_NO_COPY_CLASS(wxStreamTempInputBuffer)
+    wxDECLARE_NO_COPY_CLASS(wxStreamTempInputBuffer);
 };
 
 inline wxStreamTempInputBuffer::wxStreamTempInputBuffer()
diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 27e51b8f26..69df300ba2 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -137,7 +137,7 @@ private:
   wxFileConfigLineList *m_pNext,        // next node
                        *m_pPrev;        // previous one
 
-    DECLARE_NO_COPY_CLASS(wxFileConfigLineList)
+    wxDECLARE_NO_COPY_CLASS(wxFileConfigLineList);
 };
 
 // ----------------------------------------------------------------------------
@@ -178,7 +178,7 @@ public:
   void SetValue(const wxString& strValue, bool bUser = true);
   void SetLine(wxFileConfigLineList *pLine);
 
-    DECLARE_NO_COPY_CLASS(wxFileConfigEntry)
+    wxDECLARE_NO_COPY_CLASS(wxFileConfigEntry);
 };
 
 // ----------------------------------------------------------------------------
@@ -250,7 +250,7 @@ public:
   void SetLastGroup(wxFileConfigGroup *pGroup)
     { m_pLastGroup = pGroup; }
 
-  DECLARE_NO_COPY_CLASS(wxFileConfigGroup)
+  wxDECLARE_NO_COPY_CLASS(wxFileConfigGroup);
 };
 
 // ============================================================================
diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 88f9add423..0dee4cb1f1 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -140,7 +140,7 @@ private:
     bool m_flagOld;
     bool& m_flag;
 
-    DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
+    wxDECLARE_NO_COPY_CLASS(ReentrancyBlocker);
 };
 
 // ============================================================================
diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 2e9927590d..9cd5628f86 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -70,7 +70,7 @@ private:
 #endif // wxUSE_DATETIME
     }
 
-    DECLARE_NO_COPY_CLASS(wxMemoryFSFile)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryFSFile);
 };
 
 #if wxUSE_BASE
diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index add0e8392a..e2854eeb6b 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -728,7 +728,7 @@ public:
 
     wxFTP *m_ftp;
 
-    DECLARE_NO_COPY_CLASS(wxInputFTPStream)
+    wxDECLARE_NO_COPY_CLASS(wxInputFTPStream);
 };
 
 class wxOutputFTPStream : public wxSocketOutputStream
@@ -764,7 +764,7 @@ public:
 
     wxFTP *m_ftp;
 
-    DECLARE_NO_COPY_CLASS(wxOutputFTPStream)
+    wxDECLARE_NO_COPY_CLASS(wxOutputFTPStream);
 };
 
 wxInputStream *wxFTP::GetInputStream(const wxString& path)
diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index fb55baac1b..1566f40bdd 100644
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -51,7 +51,7 @@ public:
     unsigned char *pal;             // palette
     unsigned int ncolours;          // number of colours
 
-    DECLARE_NO_COPY_CLASS(GIFImage)
+    wxDECLARE_NO_COPY_CLASS(GIFImage);
 };
 
 wxDECLARE_SCOPED_PTR(GIFImage, GIFImagePtr)
diff --git a/src/common/http.cpp b/src/common/http.cpp
index da25a7828b..f6a644fda7 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -367,7 +367,7 @@ public:
 protected:
     size_t OnSysRead(void *buffer, size_t bufsize);
 
-    DECLARE_NO_COPY_CLASS(wxHTTPStream)
+    wxDECLARE_NO_COPY_CLASS(wxHTTPStream);
 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
diff --git a/src/common/image.cpp b/src/common/image.cpp
index d3bf74c5c4..433e013d05 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -88,7 +88,7 @@ public:
     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;
 
-    DECLARE_NO_COPY_CLASS(wxImageRefData)
+    wxDECLARE_NO_COPY_CLASS(wxImageRefData);
 };
 
 wxImageRefData::wxImageRefData()
diff --git a/src/common/init.cpp b/src/common/init.cpp
index 2450ec4033..0e76cc4aba 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -65,7 +65,7 @@ public:
     virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
     virtual bool DoYield(bool, long) { return true; }
 
-    DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
+    wxDECLARE_NO_COPY_CLASS(wxDummyConsoleApp);
 };
 
 // we need a special kind of auto pointer to wxApp which not only deletes the
@@ -94,7 +94,7 @@ public:
         wxApp::SetInstance(ptr);
     }
 
-    DECLARE_NO_COPY_CLASS(wxAppPtr)
+    wxDECLARE_NO_COPY_CLASS(wxAppPtr);
 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()
@@ -161,7 +161,7 @@ static struct InitData
     wchar_t **argv;
 #endif // wxUSE_UNICODE
 
-    DECLARE_NO_COPY_CLASS(InitData)
+    wxDECLARE_NO_COPY_CLASS(InitData);
 } gs_initData;
 
 // ============================================================================
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 2284a72490..657273a324 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -959,7 +959,7 @@ private:
 
     bool m_bSwapped;   // wrong endianness?
 
-    DECLARE_NO_COPY_CLASS(wxMsgCatalogFile)
+    wxDECLARE_NO_COPY_CLASS(wxMsgCatalogFile);
 };
 
 
diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index a5dab64013..6cf153bd38 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -76,7 +76,7 @@ private:
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxPopupWindowHandler)
+    wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler);
 };
 
 class wxPopupFocusHandler : public wxEvtHandler
@@ -92,7 +92,7 @@ private:
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxPopupFocusHandler)
+    wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index 1206b78fa0..6cbdbb9d5a 100644
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -82,7 +82,7 @@ private:
     // just to suppress a gcc warning
     friend class wxRendererPtrDummyFriend;
 
-    DECLARE_NO_COPY_CLASS(wxRendererPtr)
+    wxDECLARE_NO_COPY_CLASS(wxRendererPtr);
 };
 
 // return the global and unique wxRendererPtr
diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 0aed548807..03712a890a 100644
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -126,7 +126,7 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTCPEventHandler)
+    wxDECLARE_NO_COPY_CLASS(wxTCPEventHandler);
 };
 
 enum
@@ -161,7 +161,7 @@ private:
     static wxTCPEventHandler *ms_handler;
 
     DECLARE_DYNAMIC_CLASS(wxTCPEventHandlerModule)
-    DECLARE_NO_COPY_CLASS(wxTCPEventHandlerModule)
+    wxDECLARE_NO_COPY_CLASS(wxTCPEventHandlerModule);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxTCPEventHandlerModule, wxModule)
@@ -282,7 +282,7 @@ private:
     wxDataInputStream  m_dataIn;
     wxDataOutputStream m_dataOut;
 
-    DECLARE_NO_COPY_CLASS(wxIPCSocketStreams)
+    wxDECLARE_NO_COPY_CLASS(wxIPCSocketStreams);
 };
 
 namespace
@@ -339,7 +339,7 @@ public:
 private:
     wxIPCSocketStreams& m_streams;
 
-    DECLARE_NO_COPY_CLASS(IPCOutput)
+    wxDECLARE_NO_COPY_CLASS(IPCOutput);
 };
 
 } // anonymous namespace
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index abe4f83810..9da07423a3 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -127,7 +127,7 @@ public:
 public:
     wxSocketState() : wxObject() {}
 
-    DECLARE_NO_COPY_CLASS(wxSocketState)
+    wxDECLARE_NO_COPY_CLASS(wxSocketState);
 };
 
 // wxSocketWaitModeChanger: temporarily change the socket flags affecting its
@@ -163,7 +163,7 @@ private:
     wxSocketBase * const m_socket;
     const int m_oldflags;
 
-    DECLARE_NO_COPY_CLASS(wxSocketWaitModeChanger)
+    wxDECLARE_NO_COPY_CLASS(wxSocketWaitModeChanger);
 };
 
 // wxSocketRead/WriteGuard are instantiated before starting reading
@@ -189,7 +189,7 @@ public:
 private:
     wxSocketBase * const m_socket;
 
-    DECLARE_NO_COPY_CLASS(wxSocketReadGuard)
+    wxDECLARE_NO_COPY_CLASS(wxSocketReadGuard);
 };
 
 class wxSocketWriteGuard
@@ -213,7 +213,7 @@ public:
 private:
     wxSocketBase * const m_socket;
 
-    DECLARE_NO_COPY_CLASS(wxSocketWriteGuard)
+    wxDECLARE_NO_COPY_CLASS(wxSocketWriteGuard);
 };
 
 // ============================================================================
diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 64d31ae750..c56719561e 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -2849,7 +2849,7 @@ private:
     // were we initialized successfully?
     bool m_ok;
 
-    DECLARE_NO_COPY_CLASS(wxMBConv_wxwin)
+    wxDECLARE_NO_COPY_CLASS(wxMBConv_wxwin);
 };
 
 // make the constructors available for unit testing
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index d9242cb931..ee46f58349 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -3057,7 +3057,7 @@ public:
 private:
     wxWindowBase * const m_win;
 
-    DECLARE_NO_COPY_CLASS(DragAcceptFilesTarget)
+    wxDECLARE_NO_COPY_CLASS(DragAcceptFilesTarget);
 };
 
 
diff --git a/src/common/wrapsizer.cpp b/src/common/wrapsizer.cpp
index adca07fc18..ff7b0310ec 100644
--- a/src/common/wrapsizer.cpp
+++ b/src/common/wrapsizer.cpp
@@ -59,7 +59,7 @@ private:
     wxSizerItem& m_item;
     const int m_propOld;
 
-    DECLARE_NO_COPY_CLASS(wxPropChanger)
+    wxDECLARE_NO_COPY_CLASS(wxPropChanger);
 };
 
 } // anonymous namespace
diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 8461c74422..a3af2d6246 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -251,7 +251,7 @@ private:
     wxFileOffset m_pos;
     wxFileOffset m_len;
 
-    DECLARE_NO_COPY_CLASS(wxStoredInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxStoredInputStream);
 };
 
 wxStoredInputStream::wxStoredInputStream(wxInputStream& stream)
@@ -297,7 +297,7 @@ protected:
 
 private:
     wxFileOffset m_pos;
-    DECLARE_NO_COPY_CLASS(wxStoredOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxStoredOutputStream);
 };
 
 size_t wxStoredOutputStream::OnSysWrite(const void *buffer, size_t size)
@@ -359,7 +359,7 @@ private:
     size_t m_start;
     size_t m_end;
 
-    DECLARE_NO_COPY_CLASS(wxTeeInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxTeeInputStream);
 };
 
 wxTeeInputStream::wxTeeInputStream(wxInputStream& stream)
@@ -455,7 +455,7 @@ private:
     enum { BUFSIZE = 8192 };
     wxCharBuffer m_dummy;
 
-    DECLARE_NO_COPY_CLASS(wxRawInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxRawInputStream);
 };
 
 wxRawInputStream::wxRawInputStream(wxInputStream& stream)
diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index cf767882c5..723678c027 100644
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -31,7 +31,7 @@ public:
     wxInfoFrame(wxWindow *parent, const wxString& message);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxInfoFrame)
+    wxDECLARE_NO_COPY_CLASS(wxInfoFrame);
 };
 
 
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 4e07612000..49120ac939 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -193,7 +193,7 @@ private:
     }
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow)
+    wxDECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow);
 };
 
 BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index f809ca1cd3..d959d0ea4f 100644
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -63,7 +63,7 @@ private:
     // the text we show
     wxTextCtrl *m_text;
 
-    DECLARE_NO_COPY_CLASS(wxDumpPreviewDlg)
+    wxDECLARE_NO_COPY_CLASS(wxDumpPreviewDlg);
 };
 
 wxDumpPreviewDlg::wxDumpPreviewDlg(wxWindow *parent,
@@ -138,7 +138,7 @@ private:
 #endif // wxUSE_FILEDLG
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxDumpOpenExternalDlg)
+    wxDECLARE_NO_COPY_CLASS(wxDumpOpenExternalDlg);
 };
 
 BEGIN_EVENT_TABLE(wxDumpOpenExternalDlg, wxDialog)
@@ -272,7 +272,7 @@ private:
     wxArrayString m_files;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxDebugReportDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDebugReportDialog);
 };
 
 // ============================================================================
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 6b29c3a902..7380736638 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -381,7 +381,7 @@ private:
 
     cairo_t* m_context;
 
-    DECLARE_NO_COPY_CLASS(wxCairoContext)
+    wxDECLARE_NO_COPY_CLASS(wxCairoContext);
 };
 
 //-----------------------------------------------------------------------------
diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index fd023f93b8..07fbac049b 100644
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -191,7 +191,7 @@ public:
 private:
     const wxHtmlListBox& m_hlbox;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index c1d26eac3a..0157da1b32 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -171,7 +171,7 @@ private:
     static size_t ms_maxLength;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxLogDialog)
+    wxDECLARE_NO_COPY_CLASS(wxLogDialog);
 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
@@ -561,7 +561,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxLogFrame)
+    wxDECLARE_NO_COPY_CLASS(wxLogFrame);
 };
 
 BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
diff --git a/src/generic/notifmsgg.cpp b/src/generic/notifmsgg.cpp
index 364cab307e..f563d7a5b1 100644
--- a/src/generic/notifmsgg.cpp
+++ b/src/generic/notifmsgg.cpp
@@ -81,7 +81,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxNotificationMessageDialog)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessageDialog);
 };
 
 // ============================================================================
diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 9691ab4df4..ef7dce4437 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -86,7 +86,7 @@ private:
 
     bool m_hasDrawnWindow;
 
-    DECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler);
 };
 
 #if wxUSE_TIMER
@@ -112,7 +112,7 @@ private:
     int m_pos,
         m_orient;
 
-    DECLARE_NO_COPY_CLASS(wxAutoScrollTimer)
+    wxDECLARE_NO_COPY_CLASS(wxAutoScrollTimer);
 };
 
 // ============================================================================
diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 7b3ce8b0b7..feee0ac4b6 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -82,7 +82,7 @@ public:
 private:
     wxTextFile m_textfile;
 
-    DECLARE_NO_COPY_CLASS(wxFileTipProvider)
+    wxDECLARE_NO_COPY_CLASS(wxFileTipProvider);
 };
 #endif // wxUSE_TEXTFILE
 
@@ -129,7 +129,7 @@ private:
     wxCheckBox *m_checkbox;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTipDialog)
+    wxDECLARE_NO_COPY_CLASS(wxTipDialog);
 };
 
 // ============================================================================
diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index daea96f669..8238cd83c4 100644
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -71,7 +71,7 @@ private:
 #endif // !wxUSE_POPUPWIN
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTipWindowView)
+    wxDECLARE_NO_COPY_CLASS(wxTipWindowView);
 };
 
 // ============================================================================
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index c143230058..d13898a07f 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -86,7 +86,7 @@ public:
 private:
     wxGenericTreeCtrl *m_owner;
 
-    DECLARE_NO_COPY_CLASS(wxTreeRenameTimer)
+    wxDECLARE_NO_COPY_CLASS(wxTreeRenameTimer);
 };
 
 // control used for in-place edit
@@ -114,7 +114,7 @@ private:
     bool                m_aboutToFinish;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTreeTextCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeTextCtrl);
 };
 
 // timer used to clear wxGenericTreeCtrl::m_findPrefix if no key was pressed
@@ -132,7 +132,7 @@ public:
 private:
     wxGenericTreeCtrl *m_owner;
 
-    DECLARE_NO_COPY_CLASS(wxTreeFindTimer)
+    wxDECLARE_NO_COPY_CLASS(wxTreeFindTimer);
 };
 
 // a tree item
@@ -355,7 +355,7 @@ private:
     unsigned int        m_isBold      :1; // render the label in bold font
     unsigned int        m_ownsAttr    :1; // delete attribute when done
 
-    DECLARE_NO_COPY_CLASS(wxGenericTreeItem)
+    wxDECLARE_NO_COPY_CLASS(wxGenericTreeItem);
 };
 
 // =============================================================================
diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index 7192c4e15d..a4256ef804 100644
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -53,7 +53,7 @@ public:
 private:
     wxVarScrollHelperBase *m_scrollHelper;
 
-    DECLARE_NO_COPY_CLASS(wxVarScrollHelperEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxVarScrollHelperEvtHandler);
 };
 
 // ============================================================================
diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 7be26532d9..1094233cd8 100644
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -81,7 +81,7 @@ private:
     const gchar **m_strings;
     size_t m_count;
 
-    DECLARE_NO_COPY_CLASS(GtkArray)
+    wxDECLARE_NO_COPY_CLASS(GtkArray);
 };
 
 } // anonymous namespace
diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 96d6da0c0f..92fb7ecd8a 100644
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -102,7 +102,7 @@ public:
 private:
     static wxClipboard *ms_clipboard;
 
-    DECLARE_NO_COPY_CLASS(wxClipboardSync)
+    wxDECLARE_NO_COPY_CLASS(wxClipboardSync);
 };
 
 wxClipboard *wxClipboardSync::ms_clipboard = NULL;
diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index ff2b953c97..6a226d4d0b 100644
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -52,7 +52,7 @@ public:
     guint16 m_blue;
     wxByte m_alpha;
 
-    DECLARE_NO_COPY_CLASS(wxColourRefData)
+    wxDECLARE_NO_COPY_CLASS(wxColourRefData);
 };
 
 void wxColourRefData::FreeColour()
diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 3823149cad..923cb6c28e 100644
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -184,7 +184,7 @@ public:
     wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new,
         (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL )
 
-    DECLARE_NO_COPY_CLASS(wxGnomePrintLibrary)
+    wxDECLARE_NO_COPY_CLASS(wxGnomePrintLibrary);
 };
 
 wxGnomePrintLibrary::wxGnomePrintLibrary()
diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 83aaac8881..506fc99d8f 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -127,7 +127,7 @@ public:
 protected:
     virtual void AddText(const wxString& WXUNUSED(txt)) {}
 
-    DECLARE_NO_COPY_CLASS(HP_Parser)
+    wxDECLARE_NO_COPY_CLASS(HP_Parser);
 };
 
 
@@ -170,7 +170,7 @@ class HP_TagHandler : public wxHtmlTagHandler
             m_parentItem = NULL;
         }
 
-    DECLARE_NO_COPY_CLASS(HP_TagHandler)
+    wxDECLARE_NO_COPY_CLASS(HP_TagHandler);
 };
 
 
diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 78b4719acf..1a079d8f76 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -144,7 +144,7 @@ public:
 private:
     wxHtmlHelpWindow *m_Window;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow);
     DECLARE_EVENT_TABLE()
 };
 
@@ -1277,7 +1277,7 @@ public:
     }
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxHtmlHelpWindowOptionsDialog)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindowOptionsDialog);
 };
 
 BEGIN_EVENT_TABLE(wxHtmlHelpWindowOptionsDialog, wxDialog)
diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index ba8154d00d..75c98b5147 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -897,7 +897,7 @@ public:
 protected:
     virtual void AddText(const wxString& WXUNUSED(txt)) {}
 
-    DECLARE_NO_COPY_CLASS(wxMetaTagParser)
+    wxDECLARE_NO_COPY_CLASS(wxMetaTagParser);
 };
 
 class wxMetaTagHandler : public wxHtmlTagHandler
@@ -910,7 +910,7 @@ public:
 private:
     wxString *m_retval;
 
-    DECLARE_NO_COPY_CLASS(wxMetaTagHandler)
+    wxDECLARE_NO_COPY_CLASS(wxMetaTagHandler);
 };
 
 bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index b93b8f9b6b..56c6f5d7b7 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -71,7 +71,7 @@ private:
     int m_pos,
         m_orient;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer);
 };
 
 void wxHtmlWinAutoScrollTimer::Notify()
diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index fc875b6b8f..c83704ad4c 100644
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -46,7 +46,7 @@ class wxHtmlLineCell : public wxHtmlCell
         // Should we draw 3-D shading or not
       bool m_HasShading;
 
-      DECLARE_NO_COPY_CLASS(wxHtmlLineCell)
+      wxDECLARE_NO_COPY_CLASS(wxHtmlLineCell);
 };
 
 
diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index d2fbb26652..43904eac78 100644
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -68,7 +68,7 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
                   wxHtmlRenderingInfo& WXUNUSED(info)) {}
 
 
-    DECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell);
 };
 
 
@@ -246,7 +246,7 @@ class wxHtmlImageMapCell : public wxHtmlCell
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                   wxHtmlRenderingInfo& WXUNUSED(info)) {}
 
-    DECLARE_NO_COPY_CLASS(wxHtmlImageMapCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapCell);
 };
 
 
@@ -315,7 +315,7 @@ private:
     wxHtmlImageMapCell *m_imageMap;
     wxString            m_mapName;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlImageCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlImageCell);
 };
 
 #if wxUSE_GIF && wxUSE_TIMER
@@ -331,7 +331,7 @@ class wxGIFTimer : public wxTimer
     private:
         wxHtmlImageCell *m_cell;
 
-    DECLARE_NO_COPY_CLASS(wxGIFTimer)
+    wxDECLARE_NO_COPY_CLASS(wxGIFTimer);
 };
 #endif
 
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index f1627378b6..02d38228cd 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -79,7 +79,7 @@ public:
               wxHtmlRenderingInfo& WXUNUSED(info)) {}
 
 private:
-    DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell);
 };
 
 bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) const
diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index cfb4d5b32c..9343b893f5 100644
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -51,7 +51,7 @@ public:
         }
     }
 
-    DECLARE_NO_COPY_CLASS(wxHtmlAnchorCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlAnchorCell);
 };
 
 
diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 98f1d2b9b1..a008562b9f 100644
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -41,7 +41,7 @@ class wxHtmlListmarkCell : public wxHtmlCell
         void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
                   wxHtmlRenderingInfo& info);
 
-    DECLARE_NO_COPY_CLASS(wxHtmlListmarkCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlListmarkCell);
 };
 
 wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxBRUSHSTYLE_SOLID)
@@ -93,7 +93,7 @@ class wxHtmlListCell : public wxHtmlContainerCell
         void AddRow(wxHtmlContainerCell *mark, wxHtmlContainerCell *cont);
         virtual void Layout(int w);
 
-    DECLARE_NO_COPY_CLASS(wxHtmlListCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlListCell);
 };
 
 wxHtmlListCell::wxHtmlListCell(wxHtmlContainerCell *parent) : wxHtmlContainerCell(parent)
diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 8540af13f2..ffca46df3c 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -119,7 +119,7 @@ private:
     // only once, before first Layout().
     void ComputeMinMaxWidths();
 
-    DECLARE_NO_COPY_CLASS(wxHtmlTableCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlTableCell);
 };
 
 
diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 6cf188e3fd..dfcb758f2b 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -54,7 +54,7 @@ protected:
     HACCEL      m_hAccel;
     bool        m_ok;
 
-    DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)
+    wxDECLARE_NO_COPY_CLASS(wxAcceleratorRefData);
 };
 
 // ============================================================================
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 342045001a..5273274406 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -396,7 +396,7 @@ private:
     GetConsoleCommandHistory_t m_pfnGetConsoleCommandHistory;
     GetConsoleCommandHistoryLength_t m_pfnGetConsoleCommandHistoryLength;
 
-    DECLARE_NO_COPY_CLASS(wxConsoleStderr)
+    wxDECLARE_NO_COPY_CLASS(wxConsoleStderr);
 };
 
 bool wxConsoleStderr::DoInit()
diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 99d72f3e89..7cfdff2a5f 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -146,7 +146,7 @@ private:
     wxCheckListBox *m_pParent;
     size_t          m_nIndex;
 
-    DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
+    wxDECLARE_NO_COPY_CLASS(wxCheckListBoxItem);
 };
 
 wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index f99f3963bf..fcb7e82281 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -219,7 +219,7 @@ private:
     COLORREF m_oldColFg,
              m_oldColBg;
 
-    DECLARE_NO_COPY_CLASS(wxTextColoursChanger)
+    wxDECLARE_NO_COPY_CLASS(wxTextColoursChanger);
 };
 
 // background mode
@@ -259,7 +259,7 @@ private:
     const HDC m_hdc;
     int m_oldMode;
 
-    DECLARE_NO_COPY_CLASS(wxBkModeChanger)
+    wxDECLARE_NO_COPY_CLASS(wxBkModeChanger);
 };
 
 // instead of duplicating the same code which sets and then restores text
@@ -275,7 +275,7 @@ public:
     wxBrushAttrsSetter(wxMSWDCImpl& dc);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxBrushAttrsSetter)
+    wxDECLARE_NO_COPY_CLASS(wxBrushAttrsSetter);
 };
 
 // this class saves the old stretch blit mode during its life time
@@ -306,7 +306,7 @@ private:
 
     int m_modeOld;
 
-    DECLARE_NO_COPY_CLASS(StretchBltModeChanger)
+    wxDECLARE_NO_COPY_CLASS(StretchBltModeChanger);
 };
 
 #if wxUSE_DYNLIB_CLASS
diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index dd7476f284..66a5a034fa 100644
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -237,7 +237,7 @@ private:
     private:
         wxDialUpManagerMSW *m_dialUpManager;
 
-        DECLARE_NO_COPY_CLASS(RasTimer)
+        wxDECLARE_NO_COPY_CLASS(RasTimer);
     } m_timerStatusPolling;
 
     // thread handle for the thread sitting on connection change event
@@ -288,7 +288,7 @@ private:
     // this flag tells us whether a call to RasDial() is in progress
     static wxDialUpManagerMSW *ms_dialer;
 
-    DECLARE_NO_COPY_CLASS(wxDialUpManagerMSW)
+    wxDECLARE_NO_COPY_CLASS(wxDialUpManagerMSW);
 };
 
 // module to destroy helper window created by wxDialUpManagerMSW
diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 1bdeb321f7..08bb1e3f75 100644
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -132,7 +132,7 @@ private:
 
     int      m_flags;
 
-    DECLARE_NO_COPY_CLASS(wxDirData)
+    wxDECLARE_NO_COPY_CLASS(wxDirData);
 };
 
 // ============================================================================
diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index aec1509076..93c673b3ea 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -256,7 +256,7 @@ protected:
     wxDisplayInfoArray m_displays;
 
 
-    DECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base);
 };
 
 // ----------------------------------------------------------------------------
@@ -275,7 +275,7 @@ public:
     virtual bool ChangeMode(const wxVideoMode& mode);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxDisplayImplMultimon)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplMultimon);
 };
 
 class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base
@@ -327,7 +327,7 @@ struct wxDisplayInfoDirectDraw : wxDisplayInfo
     const GUID m_guid;
 
 
-    DECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw);
 };
 
 class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
@@ -351,7 +351,7 @@ public:
 private:
     IDirectDraw2 *m_pDD2;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw);
 };
 
 class wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base
@@ -380,7 +380,7 @@ private:
     // dynamically resolved DirectDrawCreate()
     DirectDrawCreate_t m_pfnDirectDrawCreate;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw);
 };
 
 #endif // wxUSE_DIRECTDRAW
@@ -944,7 +944,7 @@ private:
     wxArrayVideoModes& m_modes;
     const wxVideoMode& m_modeMatch;
 
-    DECLARE_NO_COPY_CLASS(wxDDVideoModesAdder)
+    wxDECLARE_NO_COPY_CLASS(wxDDVideoModesAdder);
 };
 
 HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,
diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index 280dab0e28..9b1e7428fb 100644
--- a/src/msw/dlmsw.cpp
+++ b/src/msw/dlmsw.cpp
@@ -65,7 +65,7 @@ private:
     wxDynamicLibrary m_dll;
 
 
-    DECLARE_NO_COPY_CLASS(wxVersionDLL)
+    wxDECLARE_NO_COPY_CLASS(wxVersionDLL);
 };
 
 // class used to create wxDynamicLibraryDetails objects
diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 61441c2782..8ea315b657 100644
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -91,7 +91,7 @@ private:
     // registered Message for Dialog
     static UINT ms_msgFindDialog;
 
-    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl)
+    wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl);
 };
 
 UINT wxFindReplaceDialogImpl::ms_msgFindDialog = 0;
diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index fe70af5e6b..27c2832868 100644
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -90,7 +90,7 @@ private:
     // the list of facenames we already found while enumerating facenames
     wxArrayString m_facenames;
 
-    DECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper)
+    wxDECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index d3d423b717..79dc6b1c50 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -187,7 +187,7 @@ private:
     LV_ITEM_NATIVE *m_pItem;
     LV_ITEM_NATIVE m_item;
 
-    DECLARE_NO_COPY_CLASS(wxLV_ITEM)
+    wxDECLARE_NO_COPY_CLASS(wxLV_ITEM);
 };
 
 ///////////////////////////////////////////////////////
@@ -235,7 +235,7 @@ public:
            delete attr;
    }
 
-    DECLARE_NO_COPY_CLASS(wxListItemInternalData)
+    wxDECLARE_NO_COPY_CLASS(wxListItemInternalData);
 };
 
 // Get the internal data structure
diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index 193d300664..17954f4054 100644
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -1925,7 +1925,7 @@ private:
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 
-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);
 };
 
 
diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index d86f872373..c73fc1c38d 100644
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -1509,7 +1509,7 @@ private:
     bool m_bLoadEventSent; // Whether or not FinishLoaded was already called
                            // prevents it being called multiple times
 
-    DECLARE_NO_COPY_CLASS(wxAMMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxAMMediaEvtHandler);
 };
 
 //===========================================================================
diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp
index ca4d627ac7..694386903f 100644
--- a/src/msw/mediactrl_qt.cpp
+++ b/src/msw/mediactrl_qt.cpp
@@ -432,7 +432,7 @@ private:
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 
-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);
 };
 
 
diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index 8a6f69a29d..24145bbd88 100644
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -700,7 +700,7 @@ public:
 private:
     wxWMP10MediaBackend *m_amb;
 
-    DECLARE_NO_COPY_CLASS(wxWMP10MediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxWMP10MediaEvtHandler);
 };
 #endif
 
diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp
index 748445e3ae..31a4472be4 100644
--- a/src/msw/notifmsg.cpp
+++ b/src/msw/notifmsg.cpp
@@ -58,7 +58,7 @@ public:
     virtual bool DoClose() = 0;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxNotifMsgImpl)
+    wxDECLARE_NO_COPY_CLASS(wxNotifMsgImpl);
 };
 
 // implementation which is simply a bridge to wxGenericNotificationMessage
@@ -184,7 +184,7 @@ private:
 
     wxTaskBarIcon * const m_icon;
 
-    DECLARE_NO_COPY_CLASS(wxNotificationIconEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationIconEvtHandler);
 };
 
 // ============================================================================
diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index e2bbed939d..a2ebcd017f 100644
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -87,7 +87,7 @@ private:
     wxVariant m_variant;  // List of further variants
     int       m_nCurrent; // Current enum position
 
-    DECLARE_NO_COPY_CLASS(wxIEnumVARIANT)
+    wxDECLARE_NO_COPY_CLASS(wxIEnumVARIANT);
 };
 
 // ----------------------------------------------------------------------------
@@ -335,7 +335,7 @@ public:
 private:
     wxAccessible *m_pAccessible;      // pointer to C++ class we belong to
 
-    DECLARE_NO_COPY_CLASS(wxIAccessible)
+    wxDECLARE_NO_COPY_CLASS(wxIAccessible);
 };
 
 // ============================================================================
diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index ff9169dbe5..ba2cb10bc8 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -90,7 +90,7 @@ private:
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
 
-    DECLARE_NO_COPY_CLASS(wxIEnumFORMATETC)
+    wxDECLARE_NO_COPY_CLASS(wxIEnumFORMATETC);
 };
 
 // ----------------------------------------------------------------------------
@@ -126,7 +126,7 @@ private:
 
     bool m_mustDelete;
 
-    DECLARE_NO_COPY_CLASS(wxIDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxIDataObject);
 };
 
 // ============================================================================
@@ -1199,7 +1199,7 @@ public:
         { return GetDataHere(buf); }
 #endif
 
-    DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
+    wxDECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject);
 };
 
 
diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 90f89d419e..fad7caec37 100644
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -64,7 +64,7 @@ private:
   DWORD         m_grfInitKeyState;  // button which started the d&d operation
   wxDropSource *m_pDropSource;      // pointer to C++ class we belong to
 
-  DECLARE_NO_COPY_CLASS(wxIDropSource)
+  wxDECLARE_NO_COPY_CLASS(wxIDropSource);
 };
 
 // ============================================================================
diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp
index 385dd52660..2e65f600b1 100644
--- a/src/msw/ole/droptgt.cpp
+++ b/src/msw/ole/droptgt.cpp
@@ -82,7 +82,7 @@ protected:
     // get default drop effect for given keyboard flags
     static DWORD GetDropEffect(DWORD flags, wxDragResult defaultAction, DWORD pdwEffect);
 
-    DECLARE_NO_COPY_CLASS(wxIDropTarget)
+    wxDECLARE_NO_COPY_CLASS(wxIDropTarget);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index e09178b7f1..034a3476e4 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -144,7 +144,7 @@ private:
     wxColour      m_colour;
     HPEN          m_hPen;
 
-    DECLARE_NO_ASSIGN_CLASS(wxPenRefData)
+    wxDECLARE_NO_ASSIGN_CLASS(wxPenRefData);
 };
 
 // ============================================================================
diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index f533f85e0d..3083a5a635 100644
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -72,7 +72,7 @@ public:
 
 private:
 // Cannot use
-//  DECLARE_NO_COPY_CLASS(wxRegionRefData)
+//  wxDECLARE_NO_COPY_CLASS(wxRegionRefData);
 // because copy constructor is explicitly declared above;
 // but no copy assignment operator is defined, so declare
 // it private to prevent the compiler from defining it:
diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 93d06259a0..094ad6c8b8 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -218,7 +218,7 @@ public:
     virtual int GetHeaderButtonHeight(wxWindow *win);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxRendererMSW)
+    wxDECLARE_NO_COPY_CLASS(wxRendererMSW);
 };
 
 // ----------------------------------------------------------------------------
@@ -277,7 +277,7 @@ public:
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 private:
-    DECLARE_NO_COPY_CLASS(wxRendererXP)
+    wxDECLARE_NO_COPY_CLASS(wxRendererXP);
 };
 
 #endif // wxUSE_UXTHEME
diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp
index 85b76977ab..d1e8490ede 100644
--- a/src/msw/snglinst.cpp
+++ b/src/msw/snglinst.cpp
@@ -92,7 +92,7 @@ private:
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 
-    DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
+    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl);
 };
 
 // ============================================================================
diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp
index 788f3e63d3..1996676888 100644
--- a/src/msw/sound.cpp
+++ b/src/msw/sound.cpp
@@ -70,7 +70,7 @@ private:
     GlobalPtr m_waveData;
     GlobalPtrLock m_waveDataPtr;
 
-    DECLARE_NO_COPY_CLASS(wxSoundDataMemory)
+    wxDECLARE_NO_COPY_CLASS(wxSoundDataMemory);
 };
 
 // class for sound files and resources
@@ -90,7 +90,7 @@ private:
     const wxString m_name;
     const bool m_isResource;
 
-    DECLARE_NO_COPY_CLASS(wxSoundDataFile)
+    wxDECLARE_NO_COPY_CLASS(wxSoundDataFile);
 };
 
 // ============================================================================
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index c75c62b382..3b9129f0a4 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -169,7 +169,7 @@ public:
 private:
     int& m_count;
 
-    DECLARE_NO_COPY_CLASS(UpdatesCountFilter)
+    wxDECLARE_NO_COPY_CLASS(UpdatesCountFilter);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index f8b91e383c..7a30e5daf8 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -155,7 +155,7 @@ private:
     const wxArrayString m_strings;
     unsigned m_index;
 
-    DECLARE_NO_COPY_CLASS(wxIEnumString)
+    wxDECLARE_NO_COPY_CLASS(wxIEnumString);
 };
 
 BEGIN_IID_TABLE(wxIEnumString)
diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 2a692e374d..29dcb255d9 100644
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -193,7 +193,7 @@ private:
     unsigned long m_owningThread;
     wxMutexType m_type;
 
-    DECLARE_NO_COPY_CLASS(wxMutexInternal)
+    wxDECLARE_NO_COPY_CLASS(wxMutexInternal);
 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType
@@ -328,7 +328,7 @@ public:
 private:
     HANDLE m_semaphore;
 
-    DECLARE_NO_COPY_CLASS(wxSemaphoreInternal)
+    wxDECLARE_NO_COPY_CLASS(wxSemaphoreInternal);
 };
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
@@ -507,7 +507,7 @@ private:
     // reaches 0 we kill the owning wxThread -- and die ourselves with it
     LONG m_nRef;
 
-    DECLARE_NO_COPY_CLASS(wxThreadInternal)
+    wxDECLARE_NO_COPY_CLASS(wxThreadInternal);
 };
 
 // small class which keeps a thread alive during its lifetime
diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index 5dcbef4abe..724dc006bc 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -214,7 +214,7 @@ private:
     size_t m_nSepCount;
     wxStaticText *m_staticText;
 
-    DECLARE_NO_COPY_CLASS(wxToolBarTool)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarTool);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index adde05b475..270f2a6fc5 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -389,7 +389,7 @@ protected:
     // the real client data
     wxTreeItemData *m_data;
 
-    DECLARE_NO_COPY_CLASS(wxTreeItemParam)
+    wxDECLARE_NO_COPY_CLASS(wxTreeItemParam);
 };
 
 // wxVirutalNode is used in place of a single root when 'hidden' root is
@@ -414,7 +414,7 @@ public:
 private:
     wxTreeItemParam *m_param;
 
-    DECLARE_NO_COPY_CLASS(wxVirtualNode)
+    wxDECLARE_NO_COPY_CLASS(wxVirtualNode);
 };
 
 #ifdef __VISUALC__
@@ -459,7 +459,7 @@ private:
 
     const wxTreeCtrl *m_tree;
 
-    DECLARE_NO_COPY_CLASS(wxTreeTraversal)
+    wxDECLARE_NO_COPY_CLASS(wxTreeTraversal);
 };
 
 // internal class for getting the selected items
@@ -499,7 +499,7 @@ public:
 private:
     wxArrayTreeItemIds& m_selections;
 
-    DECLARE_NO_COPY_CLASS(TraverseSelections)
+    wxDECLARE_NO_COPY_CLASS(TraverseSelections);
 };
 
 // internal class for counting tree items
@@ -528,7 +528,7 @@ public:
 private:
     size_t m_count;
 
-    DECLARE_NO_COPY_CLASS(TraverseCounter)
+    wxDECLARE_NO_COPY_CLASS(TraverseCounter);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp
index 94ae0483f5..d081fc1956 100644
--- a/src/msw/urlmsw.cpp
+++ b/src/msw/urlmsw.cpp
@@ -137,7 +137,7 @@ protected:
     HINTERNET m_hFile;
     size_t OnSysRead(void *buffer, size_t bufsize);
 
-    DECLARE_NO_COPY_CLASS(wxWinINetInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxWinINetInputStream);
 };
 
 size_t wxWinINetInputStream::GetSize() const
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 9aa2197290..97dd874493 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -643,7 +643,7 @@ struct wxFindByPidParams
     // the PID we're looking from
     DWORD pid;
 
-    DECLARE_NO_COPY_CLASS(wxFindByPidParams)
+    wxDECLARE_NO_COPY_CLASS(wxFindByPidParams);
 };
 
 // wxKill helper: EnumWindows() callback which is used to find the first (top
diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index f67e0eb11d..0269180d9a 100644
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -217,7 +217,7 @@ protected:
 protected:
     HANDLE m_hInput;
 
-    DECLARE_NO_COPY_CLASS(wxPipeInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxPipeInputStream);
 };
 
 class wxPipeOutputStream: public wxOutputStream
@@ -233,7 +233,7 @@ protected:
 protected:
     HANDLE m_hOutput;
 
-    DECLARE_NO_COPY_CLASS(wxPipeOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxPipeOutputStream);
 };
 
 // define this to let wxexec.cpp know that we know what we're doing
diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index e0af18abc5..fbc5e3da21 100644
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -77,7 +77,7 @@ private:
     wxColour                        m_vColour;
     WXHPEN                          m_hPen;// in OS/2 GPI this will be the PS the pen is associated with
 
-    DECLARE_NO_ASSIGN_CLASS(wxPenRefData)
+    wxDECLARE_NO_ASSIGN_CLASS(wxPenRefData);
 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp
index 6ccf144ddb..edd074f652 100644
--- a/src/os2/treectrl.cpp
+++ b/src/os2/treectrl.cpp
@@ -182,7 +182,7 @@ private:
                  );
 
     const wxTreeCtrl*               m_pTree;
-    DECLARE_NO_COPY_CLASS(wxTreeTraversal)
+    wxDECLARE_NO_COPY_CLASS(wxTreeTraversal);
 }; // end of CLASS wxTreeTraversal
 
 //
diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp
index 751ea2b6f7..0086d4ade1 100644
--- a/src/osx/carbon/cursor.cpp
+++ b/src/osx/carbon/cursor.cpp
@@ -66,7 +66,7 @@ protected:
 
     friend class wxCursor;
 
-    DECLARE_NO_ASSIGN_CLASS(wxCursorRefData)
+    wxDECLARE_NO_ASSIGN_CLASS(wxCursorRefData);
 };
 
 #define M_CURSORDATA static_cast(m_refData)
diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp
index 40deec3d81..662469dfef 100644
--- a/src/osx/carbon/mediactrl.cpp
+++ b/src/osx/carbon/mediactrl.cpp
@@ -181,7 +181,7 @@ public:
 private:
     wxQTMediaBackend *m_qtb;
 
-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);
 };
 
 //===========================================================================
diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp
index cd479a6f2d..58dc33c1a6 100644
--- a/src/osx/carbon/taskbar.cpp
+++ b/src/osx/carbon/taskbar.cpp
@@ -41,7 +41,7 @@ public:
     wxTaskBarIcon *m_parent;
     class wxTaskBarIconWindow *m_menuEventWindow;
 
-    DECLARE_NO_COPY_CLASS(wxTaskBarIconImpl)
+    wxDECLARE_NO_COPY_CLASS(wxTaskBarIconImpl);
 };
 
 //-----------------------------------------------------------------------------
diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp
index ee9dd86bec..1949980f8f 100644
--- a/src/osx/carbon/textctrl.cpp
+++ b/src/osx/carbon/textctrl.cpp
@@ -144,7 +144,7 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con
 
 class WXDLLEXPORT wxMacPortSaver
 {
-    DECLARE_NO_COPY_CLASS(wxMacPortSaver)
+    wxDECLARE_NO_COPY_CLASS(wxMacPortSaver);
 
 public:
     wxMacPortSaver( GrafPtr port );
@@ -160,7 +160,7 @@ private :
 
 class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
 {
-    DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
+    wxDECLARE_NO_COPY_CLASS(wxMacWindowClipper);
 
 public:
     wxMacWindowClipper( const wxWindow* win );
diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp
index f780d4bc03..0aa6d3939c 100644
--- a/src/osx/carbon/thread.cpp
+++ b/src/osx/carbon/thread.cpp
@@ -343,7 +343,7 @@ private:
     wxMutex& m_mutex;
     wxSemaphore m_semaphore;
 
-    DECLARE_NO_COPY_CLASS(wxConditionInternal)
+    wxDECLARE_NO_COPY_CLASS(wxConditionInternal);
 };
 
 wxConditionInternal::wxConditionInternal( wxMutex& mutex )
diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm
index b6d327b863..6c6b760274 100644
--- a/src/osx/cocoa/taskbar.mm
+++ b/src/osx/cocoa/taskbar.mm
@@ -49,7 +49,7 @@ public:
     wxMenu * CreatePopupMenu()
     { return m_taskBarIcon->CreatePopupMenu(); }
     
-    DECLARE_NO_COPY_CLASS(wxTaskBarIconImpl)
+    wxDECLARE_NO_COPY_CLASS(wxTaskBarIconImpl);
     
 protected:
     wxTaskBarIcon *m_taskBarIcon;
diff --git a/src/osx/core/display.cpp b/src/osx/core/display.cpp
index 45dcdd802f..4598f001e9 100644
--- a/src/osx/core/display.cpp
+++ b/src/osx/core/display.cpp
@@ -63,7 +63,7 @@ public:
 private:
     CGDirectDisplayID m_id;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImplMacOSX)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplMacOSX);
 };
 
 class wxDisplayFactoryMacOSX : public wxDisplayFactory
@@ -76,7 +76,7 @@ public:
     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:
-    DECLARE_NO_COPY_CLASS(wxDisplayFactoryMacOSX)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryMacOSX);
 };
 
 // ============================================================================
diff --git a/src/osx/core/sockosx.cpp b/src/osx/core/sockosx.cpp
index 07ae1a7f47..917b821ce1 100644
--- a/src/osx/core/sockosx.cpp
+++ b/src/osx/core/sockosx.cpp
@@ -156,7 +156,7 @@ private:
     CFSocketRef m_socket;
     CFRunLoopSourceRef m_source;
 
-    DECLARE_NO_COPY_CLASS(wxSocketImplMac)
+    wxDECLARE_NO_COPY_CLASS(wxSocketImplMac);
 };
 
 } // anonymous namespace
diff --git a/src/osx/palette.cpp b/src/osx/palette.cpp
index 3c1a22c533..a288caa9bd 100644
--- a/src/osx/palette.cpp
+++ b/src/osx/palette.cpp
@@ -37,7 +37,7 @@ protected:
 
     friend class WXDLLIMPEXP_FWD_CORE wxPalette;
 
-    DECLARE_NO_ASSIGN_CLASS(wxPaletteRefData)
+    wxDECLARE_NO_ASSIGN_CLASS(wxPaletteRefData);
 };
 
 wxPaletteRefData::wxPaletteRefData()
diff --git a/src/palmos/accel.cpp b/src/palmos/accel.cpp
index e6f57eac06..0171a66b97 100644
--- a/src/palmos/accel.cpp
+++ b/src/palmos/accel.cpp
@@ -40,7 +40,7 @@ protected:
     HACCEL      m_hAccel;
     bool        m_ok;
 
-    DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)
+    wxDECLARE_NO_COPY_CLASS(wxAcceleratorRefData);
 };
 
 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp
index 5c22928059..35e484a48a 100644
--- a/src/palmos/bitmap.cpp
+++ b/src/palmos/bitmap.cpp
@@ -92,7 +92,7 @@ public:
 private:
     wxMask       *m_bitmapMask;
 
-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapRefData);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/palmos/checklst.cpp b/src/palmos/checklst.cpp
index 358a423dc6..a7757f3630 100644
--- a/src/palmos/checklst.cpp
+++ b/src/palmos/checklst.cpp
@@ -142,7 +142,7 @@ public:
 
 private:
 
-    DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
+    wxDECLARE_NO_COPY_CLASS(wxCheckListBoxItem);
   bool            m_bChecked;
   wxCheckListBox *m_pParent;
   size_t          m_nIndex;
diff --git a/src/palmos/fdrepdlg.cpp b/src/palmos/fdrepdlg.cpp
index 86b31851f5..1dff7815d0 100644
--- a/src/palmos/fdrepdlg.cpp
+++ b/src/palmos/fdrepdlg.cpp
@@ -87,7 +87,7 @@ private:
     // registered Message for Dialog
     static UINT ms_msgFindDialog;
 
-    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl)
+    wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl);
 };
 
 UINT wxFindReplaceDialogImpl::ms_msgFindDialog = 0;
diff --git a/src/palmos/snglinst.cpp b/src/palmos/snglinst.cpp
index a4a0ff8d25..f795c8289b 100644
--- a/src/palmos/snglinst.cpp
+++ b/src/palmos/snglinst.cpp
@@ -68,7 +68,7 @@ private:
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 
-    DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
+    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl);
 };
 
 // ============================================================================
diff --git a/src/palmos/thread.cpp b/src/palmos/thread.cpp
index 6dbe22bb95..765a778535 100644
--- a/src/palmos/thread.cpp
+++ b/src/palmos/thread.cpp
@@ -171,7 +171,7 @@ private:
 
     HANDLE m_mutex;
 
-    DECLARE_NO_COPY_CLASS(wxMutexInternal)
+    wxDECLARE_NO_COPY_CLASS(wxMutexInternal);
 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType
@@ -224,7 +224,7 @@ public:
 private:
     HANDLE m_semaphore;
 
-    DECLARE_NO_COPY_CLASS(wxSemaphoreInternal)
+    wxDECLARE_NO_COPY_CLASS(wxSemaphoreInternal);
 };
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
@@ -339,7 +339,7 @@ private:
     // reaches 0 we kill the owning wxThread -- and die ourselves with it
     LONG m_nRef;
 
-    DECLARE_NO_COPY_CLASS(wxThreadInternal)
+    wxDECLARE_NO_COPY_CLASS(wxThreadInternal);
 };
 
 // small class which keeps a thread alive during its lifetime
diff --git a/src/palmos/toolbar.cpp b/src/palmos/toolbar.cpp
index 886cdcbb70..166d36c833 100644
--- a/src/palmos/toolbar.cpp
+++ b/src/palmos/toolbar.cpp
@@ -129,7 +129,7 @@ public:
 private:
     size_t m_nSepCount;
 
-    DECLARE_NO_COPY_CLASS(wxToolBarTool)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarTool);
 };
 
 
diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 23d28857a6..0aafee0a54 100644
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -110,7 +110,7 @@ private:
     wxRect m_rect;
     int m_depth;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImplX11)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplX11);
 };
 
 class wxDisplayFactoryX11 : public wxDisplayFactory
@@ -123,7 +123,7 @@ public:
     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:
-    DECLARE_NO_COPY_CLASS(wxDisplayFactoryX11)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryX11);
 };
 
 // ============================================================================
@@ -358,7 +358,7 @@ public:
 private:
     void *m_ptr;
 
-    DECLARE_NO_COPY_CLASS(wxX11Ptr)
+    wxDECLARE_NO_COPY_CLASS(wxX11Ptr);
 };
 
 // NB: this function is implemented using X11 and not GDK calls as it's shared
diff --git a/src/unix/stackwalk.cpp b/src/unix/stackwalk.cpp
index 62669bcf2d..d65700afa6 100644
--- a/src/unix/stackwalk.cpp
+++ b/src/unix/stackwalk.cpp
@@ -67,7 +67,7 @@ public:
 private:
     FILE *m_fp;
 
-    DECLARE_NO_COPY_CLASS(wxStdioPipe)
+    wxDECLARE_NO_COPY_CLASS(wxStdioPipe);
 };
 
 // ============================================================================
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index d7036f000b..f4918245fb 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -429,7 +429,7 @@ private:
     int m_argc;
     char **m_argv;
 
-    DECLARE_NO_COPY_CLASS(ArgsArray)
+    wxDECLARE_NO_COPY_CLASS(ArgsArray);
 };
 
 } // anonymous namespace
@@ -1263,7 +1263,7 @@ public:
 protected:
     const int m_fd;
 
-    DECLARE_NO_COPY_CLASS(wxReadFDIOHandler)
+    wxDECLARE_NO_COPY_CLASS(wxReadFDIOHandler);
 };
 
 // class for monitoring our end of the process detection pipe, simply sets a
@@ -1284,7 +1284,7 @@ public:
 private:
     bool m_terminated;
 
-    DECLARE_NO_COPY_CLASS(wxEndHandler)
+    wxDECLARE_NO_COPY_CLASS(wxEndHandler);
 };
 
 #if HAS_PIPE_INPUT_STREAM
@@ -1313,7 +1313,7 @@ public:
 private:
     wxStreamTempInputBuffer * const m_buf;
 
-    DECLARE_NO_COPY_CLASS(wxRedirectedIOHandler)
+    wxDECLARE_NO_COPY_CLASS(wxRedirectedIOHandler);
 };
 
 #endif // HAS_PIPE_INPUT_STREAM
-- 
2.45.2