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

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

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) {}

include/wx/anidecod.h

@@ -68,7 +68,7 @@ private:
     static wxCURHandler sm_handler;
 
 
-    DECLARE_NO_COPY_CLASS(wxANIDecoder)
+    wxDECLARE_NO_COPY_CLASS(wxANIDecoder);
 };
 
 

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

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

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

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()
 };
 

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);
 };
 
 

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

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

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

include/wx/checkbox.h

@@ -130,7 +130,7 @@ protected:
     }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxCheckBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxCheckBoxBase);
 };
 
 #if defined(__WXUNIVERSAL__)

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

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);
 };
 
 // ----------------------------------------------------------------------------

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

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

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

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_

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)

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

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,

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_

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,

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_

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

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

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;

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);
 };
 
 

include/wx/containr.h

@@ -215,7 +215,7 @@ public:
 
 protected:
 
-    DECLARE_NO_COPY_CLASS(wxControlContainer)
+    wxDECLARE_NO_COPY_CLASS(wxControlContainer);
 };
 
 // ----------------------------------------------------------------------------

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);
 };
 
 // ----------------------------------------------------------------------------

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

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

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
 

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);
 };
 
 // ----------------------------------------------------------------------------

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

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);
 };
 
 

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__

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

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_

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)  \
+#define wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg)  \
-    private:                                            \
+    private:                                              \
-        classname(const classname<arg>&);               \
+        classname(const classname<arg>&);                 \
-        classname& operator=(const classname<arg>&);
+        classname& operator=(const classname<arg>&)
 
-#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 */

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_

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_

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()
 };
 

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()
 };
 

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

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_

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_

include/wx/display_impl.h

@@ -89,7 +89,7 @@ protected:
 
     friend class wxDisplayFactory;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImpl)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImpl);
 };
 
 // ----------------------------------------------------------------------------

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

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

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

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__

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);
 };
 
 

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_

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&);

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

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

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)
 };
 

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);
 };
 
 

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);
 };
 
 

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

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

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

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

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

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)
 };
 

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

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

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);
 };
 
 //---------------------------------------------------------------------------

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)

include/wx/generic/busyinfo.h

@@ -33,7 +33,7 @@ public:
 private:
     wxFrame *m_InfoFrame;
 
-    DECLARE_NO_COPY_CLASS(wxBusyInfo)
+    wxDECLARE_NO_COPY_CLASS(wxBusyInfo);
 };
 
 

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

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);
 };
 
 // ----------------------------------------------------------------------------

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_

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()
 };
 

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_

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

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

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);
 };
 
 // ----------------------------------------------------------------------------

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

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

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_

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

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_

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);
 };
 
 // ----------------------------------------------------------------------------

include/wx/generic/private/grid.h

@@ -244,7 +244,7 @@ private:
     wxVector<wxGridHeaderColumn> 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);
 };
 
 

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

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;

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_

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);
 };
 
 

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);
 };
 
 // ----------------------------------------------------------------------------

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);
 };
 
 // ----------------------------------------------------------------------------

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

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_

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

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)
 };
 

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__

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);
 };
 
 

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_

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);
 };
 
 // ----------------------------------------------------------------------------