]> git.saurik.com Git - wxWidgets.git/commitdiff
add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS...
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 8 Feb 2009 11:45:59 +0000 (11:45 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 8 Feb 2009 11:45:59 +0000 (11:45 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

424 files changed:
docs/changes.txt
include/wx/access.h
include/wx/anidecod.h
include/wx/app.h
include/wx/arrstr.h
include/wx/bmpbuttn.h
include/wx/bookctrl.h
include/wx/buffer.h
include/wx/button.h
include/wx/cairo.h
include/wx/caret.h
include/wx/checkbox.h
include/wx/checklst.h
include/wx/choice.h
include/wx/clipbrd.h
include/wx/cmdargs.h
include/wx/cmdline.h
include/wx/cmdproc.h
include/wx/cocoa/cursor.h
include/wx/cocoa/dc.h
include/wx/cocoa/dirdlg.h
include/wx/cocoa/evtloop.h
include/wx/cocoa/filedlg.h
include/wx/cocoa/msgdlg.h
include/wx/cocoa/private/scrollview.h
include/wx/cocoa/trackingrectmanager.h
include/wx/cocoa/window.h
include/wx/confbase.h
include/wx/containr.h
include/wx/control.h
include/wx/convauto.h
include/wx/cshelp.h
include/wx/ctrlsub.h
include/wx/dataobj.h
include/wx/datstrm.h
include/wx/dc.h
include/wx/dcbuffer.h
include/wx/dcgraph.h
include/wx/dcmirror.h
include/wx/defs.h
include/wx/dfb/dcclient.h
include/wx/dfb/evtloop.h
include/wx/dfb/window.h
include/wx/dialog.h
include/wx/dialup.h
include/wx/dir.h
include/wx/display.h
include/wx/display_impl.h
include/wx/dnd.h
include/wx/docmdi.h
include/wx/docview.h
include/wx/dynlib.h
include/wx/dynload.h
include/wx/encconv.h
include/wx/event.h
include/wx/evtloop.h
include/wx/fdrepdlg.h
include/wx/fileconf.h
include/wx/filedlg.h
include/wx/filesys.h
include/wx/fmappriv.h
include/wx/fontdlg.h
include/wx/fontenum.h
include/wx/fontmap.h
include/wx/frame.h
include/wx/fs_arc.h
include/wx/fs_filter.h
include/wx/gauge.h
include/wx/gbsizer.h
include/wx/gdicmn.h
include/wx/generic/busyinfo.h
include/wx/generic/calctrlg.h
include/wx/generic/choicdgg.h
include/wx/generic/ctrlsub.h
include/wx/generic/dataview.h
include/wx/generic/datectrl.h
include/wx/generic/dirctrlg.h
include/wx/generic/dragimgg.h
include/wx/generic/grid.h
include/wx/generic/grideditors.h
include/wx/generic/gridsel.h
include/wx/generic/headerctrlg.h
include/wx/generic/logg.h
include/wx/generic/notifmsg.h
include/wx/generic/numdlgg.h
include/wx/generic/private/grid.h
include/wx/generic/progdlgg.h
include/wx/generic/sashwin.h
include/wx/generic/scrolwin.h
include/wx/generic/splash.h
include/wx/generic/splitter.h
include/wx/generic/textdlgg.h
include/wx/generic/treectlg.h
include/wx/generic/wizard.h
include/wx/gifdecod.h
include/wx/graphics.h
include/wx/gtk/calctrl.h
include/wx/gtk/dataview.h
include/wx/gtk/evtloop.h
include/wx/gtk/gnome/gprint.h
include/wx/gtk/hildon/notifmsg.h
include/wx/gtk/print.h
include/wx/gtk/private/object.h
include/wx/gtk/private/string.h
include/wx/gtk/scrolwin.h
include/wx/gtk/window.h
include/wx/gtk1/scrolwin.h
include/wx/gtk1/window.h
include/wx/hash.h
include/wx/hashmap.h
include/wx/headerctrl.h
include/wx/html/helpctrl.h
include/wx/html/helpdata.h
include/wx/html/helpdlg.h
include/wx/html/helpfrm.h
include/wx/html/helpwnd.h
include/wx/html/htmlcell.h
include/wx/html/htmlpars.h
include/wx/html/htmltag.h
include/wx/html/htmlwin.h
include/wx/html/htmprint.h
include/wx/html/winpars.h
include/wx/htmllbox.h
include/wx/intl.h
include/wx/ipcbase.h
include/wx/list.h
include/wx/listbox.h
include/wx/log.h
include/wx/memconf.h
include/wx/memtext.h
include/wx/menu.h
include/wx/mgl/window.h
include/wx/motif/ctrlsub.h
include/wx/motif/window.h
include/wx/msgdlg.h
include/wx/mstream.h
include/wx/msw/app.h
include/wx/msw/calctrl.h
include/wx/msw/caret.h
include/wx/msw/ctrlsub.h
include/wx/msw/dc.h
include/wx/msw/dcclient.h
include/wx/msw/dcmemory.h
include/wx/msw/dcprint.h
include/wx/msw/dcscreen.h
include/wx/msw/dde.h
include/wx/msw/dialog.h
include/wx/msw/dragimag.h
include/wx/msw/enhmeta.h
include/wx/msw/fdrepdlg.h
include/wx/msw/filedlg.h
include/wx/msw/headerctrl.h
include/wx/msw/helpbest.h
include/wx/msw/iniconf.h
include/wx/msw/listctrl.h
include/wx/msw/mdi.h
include/wx/msw/metafile.h
include/wx/msw/msgdlg.h
include/wx/msw/notifmsg.h
include/wx/msw/ole/access.h
include/wx/msw/ole/automtn.h
include/wx/msw/ole/dataobj.h
include/wx/msw/ole/dataobj2.h
include/wx/msw/ole/dropsrc.h
include/wx/msw/ole/droptgt.h
include/wx/msw/printdlg.h
include/wx/msw/printwin.h
include/wx/msw/private.h
include/wx/msw/private/sockmsw.h
include/wx/msw/radiobox.h
include/wx/msw/regconf.h
include/wx/msw/registry.h
include/wx/msw/sound.h
include/wx/msw/spinctrl.h
include/wx/msw/statbmp.h
include/wx/msw/subwin.h
include/wx/msw/tls.h
include/wx/msw/toolbar.h
include/wx/msw/tooltip.h
include/wx/msw/toplevel.h
include/wx/msw/treectrl.h
include/wx/msw/uxtheme.h
include/wx/msw/wince/tbarwce.h
include/wx/msw/window.h
include/wx/msw/wrapshl.h
include/wx/nativewin.h
include/wx/notebook.h
include/wx/notifmsg.h
include/wx/object.h
include/wx/os2/app.h
include/wx/os2/dcclient.h
include/wx/os2/dcmemory.h
include/wx/os2/dcprint.h
include/wx/os2/dcscreen.h
include/wx/os2/dialog.h
include/wx/os2/listctrl.h
include/wx/os2/metafile.h
include/wx/os2/tls.h
include/wx/os2/treectrl.h
include/wx/os2/window.h
include/wx/osx/carbon/dataview.h
include/wx/osx/core/private.h
include/wx/osx/dcclient.h
include/wx/osx/dcmemory.h
include/wx/osx/dcscreen.h
include/wx/osx/glcanvas.h
include/wx/osx/metafile.h
include/wx/osx/window.h
include/wx/overlay.h
include/wx/palmos/app.h
include/wx/palmos/caret.h
include/wx/palmos/dc.h
include/wx/palmos/dcclient.h
include/wx/palmos/dcmemory.h
include/wx/palmos/dcscreen.h
include/wx/palmos/dialog.h
include/wx/palmos/dragimag.h
include/wx/palmos/enhmeta.h
include/wx/palmos/fdrepdlg.h
include/wx/palmos/filedlg.h
include/wx/palmos/listctrl.h
include/wx/palmos/mdi.h
include/wx/palmos/msgdlg.h
include/wx/palmos/pen.h
include/wx/palmos/prefconf.h
include/wx/palmos/printdlg.h
include/wx/palmos/printpalm.h
include/wx/palmos/progdlg.h
include/wx/palmos/radiobox.h
include/wx/palmos/sound.h
include/wx/palmos/spinctrl.h
include/wx/palmos/statbmp.h
include/wx/palmos/toolbar.h
include/wx/palmos/tooltip.h
include/wx/palmos/toplevel.h
include/wx/palmos/treectrl.h
include/wx/palmos/window.h
include/wx/persist.h
include/wx/persist/window.h
include/wx/popupwin.h
include/wx/printdlg.h
include/wx/private/fileback.h
include/wx/private/socket.h
include/wx/private/timer.h
include/wx/prntbase.h
include/wx/process.h
include/wx/protocol/http.h
include/wx/protocol/protocol.h
include/wx/rearrangectrl.h
include/wx/renderer.h
include/wx/richtext/richtextprint.h
include/wx/richtext/richtextsymboldlg.h
include/wx/sckipc.h
include/wx/sckstrm.h
include/wx/scrolbar.h
include/wx/scrolwin.h
include/wx/selstore.h
include/wx/sizer.h
include/wx/slider.h
include/wx/snglinst.h
include/wx/socket.h
include/wx/spinbutt.h
include/wx/spinctrl.h
include/wx/sstream.h
include/wx/statbmp.h
include/wx/statbox.h
include/wx/statline.h
include/wx/stattext.h
include/wx/statusbr.h
include/wx/strconv.h
include/wx/stream.h
include/wx/string.h
include/wx/strvararg.h
include/wx/tarstrm.h
include/wx/taskbar.h
include/wx/tbarbase.h
include/wx/textctrl.h
include/wx/textfile.h
include/wx/tglbtn.h
include/wx/thread.h
include/wx/thrimpl.cpp
include/wx/timer.h
include/wx/tipwin.h
include/wx/toplevel.h
include/wx/treectrl.h
include/wx/txtstrm.h
include/wx/univ/stdrend.h
include/wx/unix/evtloop.h
include/wx/unix/tls.h
include/wx/utils.h
include/wx/valgen.h
include/wx/validate.h
include/wx/valtext.h
include/wx/vlbox.h
include/wx/vscroll.h
include/wx/wfstream.h
include/wx/window.h
include/wx/wizard.h
include/wx/wupdlock.h
include/wx/x11/window.h
include/wx/xlocale.h
include/wx/xti.h
include/wx/zipstrm.h
include/wx/zstream.h
interface/wx/defs.h
samples/collpane/collpane.cpp
samples/debugrpt/debugrpt.cpp
samples/dialogs/dialogs.cpp
samples/dialogs/dialogs.h
samples/docview/doc.h
samples/docview/docview.h
samples/flash/flash.cpp
samples/grid/griddemo.cpp
samples/htlbox/htlbox.cpp
samples/html/test/test.cpp
samples/ipc/baseserver.cpp
samples/listctrl/listtest.h
samples/opengl/isosurf/isosurf.h
samples/opengl/penguin/penguin.h
samples/splitter/splitter.cpp
samples/widgets/itemcontainer.cpp
src/cocoa/display.mm
src/cocoa/window.mm
src/common/cshelp.cpp
src/common/dircmn.cpp
src/common/dpycmn.cpp
src/common/execcmn.cpp
src/common/fileconf.cpp
src/common/fontmap.cpp
src/common/fs_mem.cpp
src/common/ftp.cpp
src/common/gifdecod.cpp
src/common/http.cpp
src/common/image.cpp
src/common/init.cpp
src/common/intl.cpp
src/common/popupcmn.cpp
src/common/rendcmn.cpp
src/common/sckipc.cpp
src/common/socket.cpp
src/common/strconv.cpp
src/common/wincmn.cpp
src/common/wrapsizer.cpp
src/common/zipstrm.cpp
src/generic/busyinfo.cpp
src/generic/datavgen.cpp
src/generic/dbgrptg.cpp
src/generic/graphicc.cpp
src/generic/htmllbox.cpp
src/generic/logg.cpp
src/generic/notifmsgg.cpp
src/generic/scrlwing.cpp
src/generic/tipdlg.cpp
src/generic/tipwin.cpp
src/generic/treectlg.cpp
src/generic/vscroll.cpp
src/gtk/aboutdlg.cpp
src/gtk/clipbrd.cpp
src/gtk/colour.cpp
src/gtk/gnome/gprint.cpp
src/html/helpdata.cpp
src/html/helpwnd.cpp
src/html/htmlpars.cpp
src/html/htmlwin.cpp
src/html/m_hline.cpp
src/html/m_image.cpp
src/html/m_layout.cpp
src/html/m_links.cpp
src/html/m_list.cpp
src/html/m_tables.cpp
src/msw/accel.cpp
src/msw/app.cpp
src/msw/checklst.cpp
src/msw/dc.cpp
src/msw/dialup.cpp
src/msw/dir.cpp
src/msw/display.cpp
src/msw/dlmsw.cpp
src/msw/fdrepdlg.cpp
src/msw/fontenum.cpp
src/msw/listctrl.cpp
src/msw/mediactrl.cpp
src/msw/mediactrl_am.cpp
src/msw/mediactrl_qt.cpp
src/msw/mediactrl_wmp10.cpp
src/msw/notifmsg.cpp
src/msw/ole/access.cpp
src/msw/ole/dataobj.cpp
src/msw/ole/dropsrc.cpp
src/msw/ole/droptgt.cpp
src/msw/pen.cpp
src/msw/region.cpp
src/msw/renderer.cpp
src/msw/snglinst.cpp
src/msw/sound.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
src/msw/thread.cpp
src/msw/toolbar.cpp
src/msw/treectrl.cpp
src/msw/urlmsw.cpp
src/msw/utils.cpp
src/msw/utilsexc.cpp
src/os2/pen.cpp
src/os2/treectrl.cpp
src/osx/carbon/cursor.cpp
src/osx/carbon/mediactrl.cpp
src/osx/carbon/taskbar.cpp
src/osx/carbon/textctrl.cpp
src/osx/carbon/thread.cpp
src/osx/cocoa/taskbar.mm
src/osx/core/display.cpp
src/osx/core/sockosx.cpp
src/osx/palette.cpp
src/palmos/accel.cpp
src/palmos/bitmap.cpp
src/palmos/checklst.cpp
src/palmos/fdrepdlg.cpp
src/palmos/snglinst.cpp
src/palmos/thread.cpp
src/palmos/toolbar.cpp
src/unix/displayx11.cpp
src/unix/stackwalk.cpp
src/unix/utilsunx.cpp

index 24dcd3449816a29a9630bc7c172068b9140cd4a9..aa89d7deb32d4cedfce70148004d7a233cc4226c 100644 (file)
@@ -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):
 
index 8e3f6d6ccce1702510c4cd94600e11f5a00c3c94..6f098623de8256c9f2a56eea2c5a92a72e1ba4b4 100644 (file)
@@ -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) {}
index 733e5b3e1e35f6d525c654a3f151fdd968b01aaf..5d4a062be154aa8702be577bade363a6d94bc7ad 100644 (file)
@@ -68,7 +68,7 @@ private:
     static wxCURHandler sm_handler;
 
 
-    DECLARE_NO_COPY_CLASS(wxANIDecoder)
+    wxDECLARE_NO_COPY_CLASS(wxANIDecoder);
 };
 
 
index 278d540a1ca874efc56ea3028af5e27311bf161f..a5b60fed2b6660bb972947190cbfcd06d8d878db 100644 (file)
@@ -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
index f54844459b8934d8c49c9ea2aef3a1c7350753be..cdba3806d37e9f96fdda913db69198c05302c07e 100644 (file)
@@ -461,7 +461,7 @@ private:
         const wxArrayString * array;
     } m_data;
 
-    DECLARE_NO_ASSIGN_CLASS(wxArrayStringsAdapter)
+    wxDECLARE_NO_ASSIGN_CLASS(wxArrayStringsAdapter);
 };
 
 #endif // _WX_ARRSTR_H
index 4ebb839dfdd4c70d320b7b45f967cded35eb668d..0ac15ef2923ab68560b7ad9a7780dcf783ee09c5 100644 (file)
@@ -89,7 +89,7 @@ protected:
         m_marginY;
 
 
-    DECLARE_NO_COPY_CLASS(wxBitmapButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapButtonBase);
 };
 
 #if WXWIN_COMPATIBILITY_2_6
index 9085595d683eda9c00650eba5b7c188ee0e5b8a4..8ecfbef1907d66038be340cb32fbecad407f3f10 100644 (file)
@@ -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()
 };
 
index 4cc340aa518fa7248e26b58781b93958a3596c5a..51214ee9972178926206b15db26e8705dde93a71 100644 (file)
@@ -357,7 +357,7 @@ private:
     // the reference count
     size_t m_ref;
 
-    DECLARE_NO_COPY_CLASS(wxMemoryBufferData)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryBufferData);
 };
 
 
index 519d0b7ffefd0cfadffbedf4c08fb4be038132b0..25d56365f0204902b729e2ff0efefc582769693f 100644 (file)
@@ -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__)
index acb961c83f3d2022409aa45e986b7040b01277ec..a6041f2418da8bc317cfa6f6775c4fd04016566c 100644 (file)
@@ -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
index b89796ff88062fbd26b0a8f7ab821bf5db276f0e..c0a30bb893b19593df8fa4b779b291c4a3808435 100644 (file)
@@ -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
index e471358b21d0c8f8a7db90695bf6c7cb8c63fee3..60a8189f24a2a272366f5d5b209bd9b9c2a2af80 100644 (file)
@@ -130,7 +130,7 @@ protected:
     }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxCheckBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxCheckBoxBase);
 };
 
 #if defined(__WXUNIVERSAL__)
index f7ec1a8762e8dacbe39cbfc0554849b66842e441..3d38f28810df3f6a9f5c6f487418d74c62c6e22c 100644 (file)
@@ -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__)
index 18d31d2c12c59926b6b0342e582f3adf3f04ddf8..6f3c75563c29a2b4760df9f6af2d1235d6be4131 100644 (file)
@@ -59,7 +59,7 @@ public:
     virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxChoiceBase)
+    wxDECLARE_NO_COPY_CLASS(wxChoiceBase);
 };
 
 // ----------------------------------------------------------------------------
index 3c018f328125a32c56b67f01d7bae64f1d0a786c..9d1c67cd622029ce07734da4d0fa389a813a5e89 100644 (file)
@@ -189,7 +189,7 @@ public:
 private:
     wxClipboard *m_clipboard;
 
-    DECLARE_NO_COPY_CLASS(wxClipboardLocker)
+    wxDECLARE_NO_COPY_CLASS(wxClipboardLocker);
 };
 
 #endif // wxUSE_CLIPBOARD
index a120c45870fd7cc6e6be3d22bda227398c09ffd4..3f99cb50eb783363f404dade28fc834866535e6b 100644 (file)
@@ -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
index 10bf956eb0052af0cf0127481b53e97ca95acdc1..dcd76f7218e6025e8778c7e95fbf8639bdea9578 100644 (file)
@@ -250,7 +250,7 @@ private:
 
     struct wxCmdLineParserData *m_data;
 
-    DECLARE_NO_COPY_CLASS(wxCmdLineParser)
+    wxDECLARE_NO_COPY_CLASS(wxCmdLineParser);
 };
 
 #else // !wxUSE_CMDLINE_PARSER
index cba83770dd98db90358c92e9a3b0bfeb12be3f1f..6072e7fda0fe222fc6d7bb490fbfbde39c99451e 100644 (file)
@@ -137,7 +137,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
-    DECLARE_NO_COPY_CLASS(wxCommandProcessor)
+    wxDECLARE_NO_COPY_CLASS(wxCommandProcessor);
 };
 
 #endif // _WX_CMDPROC_H_
index f6b70f10c21b7204f0d47c0c94e20598d231610a..e3b3f09ca527e18db77e2cd83d685be15014cb35 100644 (file)
@@ -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)
index 4cbe3df7be01681bba3f80b2365c4ae35abc8d1f..31c565f26c9581f8270c954803a4433f51ff112b 100644 (file)
@@ -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
 //-------------------------------------------------------------------------
index 5a4017d642e5fb67b6b90ee84ccaf89bc4c73de2..29f4e9d471655157bbf7fe2c6f36c1ca66fe4664 100644 (file)
@@ -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,
index c3ff21eb17045b28714904866c9c224492950989..b61f011185227f6e01c8358d427328bb05a8986b 100644 (file)
@@ -30,7 +30,7 @@ public:
 protected:
     int m_exitcode;
 
-    DECLARE_NO_COPY_CLASS(wxGUIEventLoop)
+    wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop);
 };
 
 #endif // _WX_COCOA_EVTLOOP_H_
index 4c168bf14c4f369e6639be41a7cdfbbc0a67ae11..62f55618516cc89157c1cf203459f2b1cde6d1ce 100644 (file)
@@ -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,
index a490cf49d6674e684a99d5ce3744a6d10ea5e184..90cfdc23e97e9d85e5c10949c77378bc84a5c453 100644 (file)
@@ -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_
index dd2bdc14800fbb802fe7c5869b87e13987e1131e..7e5331ebc5e1f886bd02877373d323d84da52d30 100644 (file)
@@ -19,7 +19,7 @@
 // ========================================================================
 class wxWindowCocoaScrollView: protected wxCocoaNSView
 {
-    DECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView)
+    wxDECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView);
 public:
     wxWindowCocoaScrollView(wxWindow *owner);
     virtual ~wxWindowCocoaScrollView();
index da4483db532fca5de37d1962c04c2ec94280cd06..839685812c7c9f67c3fde9a756ee436ea53eb171 100644 (file)
@@ -18,7 +18,7 @@
 
 class wxCocoaTrackingRectManager
 {
-    DECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager)
+    wxDECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager);
 public:
     wxCocoaTrackingRectManager(wxWindow *window);
     void ClearTrackingRect();
index c0ae13a74dbd62f10a3ec52a8fec8d905980c726..309cb29e5fb99396fbe5b32773b71d19a26e25a4 100644 (file)
@@ -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;
index 32ecdde96203f37768849f38e1074e873f96fcfa..3f7b02e35d67542874bcc21a2acbc74d56f65ae6 100644 (file)
@@ -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);
 };
 
 
index 7dcf2a048e2bdb15b06be9e85a735d0e7f9e89f1..d4648b841a1fcd99172f3345149097d5c3868407 100644 (file)
@@ -215,7 +215,7 @@ public:
 
 protected:
 
-    DECLARE_NO_COPY_CLASS(wxControlContainer)
+    wxDECLARE_NO_COPY_CLASS(wxControlContainer);
 };
 
 // ----------------------------------------------------------------------------
index e2db727b4c95da3f0ee9bae52aa19274d5c182db..eaa6221123fb5ef8178ee833824f19b60d828de8 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 551f1dc96c6c700bb21dd9c3277b5418e9eb31c9..b3dde4c73ad16f88a8baf7c6c65eb9d1c7969e51 100644 (file)
@@ -137,7 +137,7 @@ private:
     bool m_consumedBOM;
 
 
-    DECLARE_NO_ASSIGN_CLASS(wxConvAuto)
+    wxDECLARE_NO_ASSIGN_CLASS(wxConvAuto);
 };
 
 #endif // wxUSE_WCHAR_T
index fc9fde211a5be0d634a49f5d6d40aae522eb259f..19f6d4c700a001ff3528f86d45cce9128f8dff45 100644 (file)
@@ -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
index 109369b4890740bdc112ec3fb56b437d843e4cd2..74dcd4b47d7634e3f65730689d1f72677cee5129 100644 (file)
@@ -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
 
index ec7b0d76a4bcf2f10a37b6af40b281408215b1f2..7eb724f3957ee00e569910269e1e7c3997c89182 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index d83aa66993c19aacabf5cb1f819a54c808a2f461..f379d8a5c650835e151636bb861e5d44dc6dcdd6 100644 (file)
@@ -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
index 1fd9da829b5c1a2912131772ba6f074df75cffa7..f9fec15da9672f49314b29c7e8dc43bfdf562571 100644 (file)
@@ -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);
 };
 
 
index 203f7cd1a38c93a7aef6be8c9718a7caf3fe71e2..991fdaad39e16493bd7ae7c47ac909ff6dbd0346 100644 (file)
@@ -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__
index 0db43629ac31bed941137e9693d845a60d5ad8fc..364d4358944826f92b171c9e3582a8f074501a6e 100644 (file)
@@ -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
index a4c61c327af90aaf2da203f59eb47c26b08f744a..d64f5004bc7645f00e27bba32115d8ca4f8acb9d 100644 (file)
@@ -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_
index 020ceade94bd6cde72098e51a1f22d0c42c0b945..835eeae759ea64cca77dd19befe74b311ab5f36e 100644 (file)
@@ -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<arg>&);               \
-        classname& operator=(const classname<arg>&);
+#define wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg)  \
+    private:                                              \
+        classname(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 */
index 17ae7ed988595137d7868074c005893b38a56baa..7559eb1b56726e561eaa24e7aa7fadce756a520b 100644 (file)
@@ -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_
index 9b010a10344d4b8523e5e17fdf439671019ad8cf..d6fa511ddca0a838d3028bcd2baa5d6a6c949edd 100644 (file)
@@ -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_
index d70774f9cc86353449cc37ed5ad2d45c7ff9aec8..b6b4c59c34d31ee229a4d5924290e774ed105256 100644 (file)
@@ -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()
 };
 
index a8160033fdb05974209692ee10ef73f5d5d15edb..36bcb643db7cb51d75d918faffc07e4aa94d74ba 100644 (file)
@@ -224,7 +224,7 @@ private:
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 
-    DECLARE_NO_COPY_CLASS(wxDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxDialogBase);
     DECLARE_EVENT_TABLE()
 };
 
index 848328c6ce704ba1ab32b7b017bb771710acc8f2..75c7c630855366ccc7fc11c1e01b5d49eb09447d 100644 (file)
@@ -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
index 9a73c6644e0e85258388f98a9f2eff19c98aa8c9..b7389f17087d625568d7f361a70d5d69798020e9 100644 (file)
@@ -156,7 +156,7 @@ private:
 
     wxDirData *m_data;
 
-    DECLARE_NO_COPY_CLASS(wxDir)
+    wxDECLARE_NO_COPY_CLASS(wxDir);
 };
 
 #endif // _WX_DIR_H_
index 354b95d73cf06b8f5d36f0da899fcff68a0a9f7c..7923e9c68782a75f343bf645329f6f3ace6a1efe 100644 (file)
@@ -122,7 +122,7 @@ private:
     wxDisplayImpl *m_impl;
 
 
-    DECLARE_NO_COPY_CLASS(wxDisplay)
+    wxDECLARE_NO_COPY_CLASS(wxDisplay);
 };
 
 #endif // _WX_DISPLAY_H_BASE_
index 015ffec46685c46e2fa2a2ecced2ecd2e49f345d..95a9da8a7e779a92a07f54dc8256c36cde1dcd74 100644 (file)
@@ -89,7 +89,7 @@ protected:
 
     friend class wxDisplayFactory;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImpl)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImpl);
 };
 
 // ----------------------------------------------------------------------------
index bacf91998ed32c321a86f5c90be9e5b5b651a467..ac3c9c4f8439188fe668e3ceeea491552e1d1a97 100644 (file)
@@ -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
index 828e6a5b6ddacace0fb89757130762c140a7e7df..e105fdcd500b98a7eb2ad77c15c148cb59d034d7 100644 (file)
@@ -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
index a7c6df2620c120388ba92d2632f98fdc0465fd18..821c7abc1c053c177f537fcc4a925a1d405be694 100644 (file)
@@ -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
index 24f1020b504e4ca8e191ebaa120bd92cc6c68cc3..3ac5dfa24c248b0cfbc37cf3e9523f1719fd239f 100644 (file)
@@ -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__
index d4c710d9402cbb6860cf8476b9494aa85ee60952..8b079d463059b41eabdf47e0e7b9ce893f31e581 100644 (file)
@@ -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);
 };
 
 
index 6a54439eebf767a35339e2675b70a5273b288044..2c4bfa21e2c37eb9801320631539fa90624a5e45 100644 (file)
@@ -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_
index c8d44ee30c1855d46a11e8e96569a5498f5754dd..073fef666a40294d9ebea3c4e662f53fd3deccda 100644 (file)
@@ -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&);
index 6841c61fd0d418ce7107d34f2b21dc33f5b2e593..7d85458ff8f28f45d4e76f8b7f83296b61b4a7f5 100644 (file)
@@ -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
index 38673d0b3da4b3aab1c48cb7e01bc6a81e6a9b43..cbca13b294be4cb0c1482047477db9f948eb120c 100644 (file)
@@ -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
index 7edce41d040cdf9db529bfcecb12ad6889ab2ead..c86af998c27e250f615c38ffc467145592ea9ecd 100644 (file)
@@ -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)
 };
 
index fa69620acc2a79147ae0c755999e48202033907b..11e720f86469148ca757d03955a5732737aa8b9b 100644 (file)
@@ -170,7 +170,7 @@ private:
 
     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
-    DECLARE_NO_COPY_CLASS(wxFileDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFileDialogBase);
 };
 
 
index 80f772c0b7a6e34e5d6c9a0828cd6c44bd490a89..51f06fad2163458cde9b442b69c7f32c160c783a 100644 (file)
@@ -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);
 };
 
 
index 63924093ce075a37dd3d5938f2a8e6d136f07714..e1dc683106ab5c7818b9ae32abeea40df001f40b 100644 (file)
@@ -65,7 +65,7 @@ private:
     bool m_ok;
 
 
-    DECLARE_NO_COPY_CLASS(wxFontMapperPathChanger)
+    wxDECLARE_NO_COPY_CLASS(wxFontMapperPathChanger);
 };
 
 #endif // wxUSE_CONFIG
index 5a2dca11957cc7d6f3d7818c529dc97d413514bf..831d92409b81cfeb83dd93cee1e206255d1ce481 100644 (file)
@@ -58,7 +58,7 @@ protected:
 
     wxFontData m_fontData;
 
-    DECLARE_NO_COPY_CLASS(wxFontDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);
 };
 
 #if WXWIN_COMPATIBILITY_2_6
index ca127b3c8aa4d97ded4dc4a2d908a6ba5053ab6b..051ee572c1970a2e43ad90cd3e9549aa16288607 100644 (file)
@@ -81,7 +81,7 @@ private:
     bool EnumerateEncodingsUTF8(const wxString& facename);
 #endif
 
-    DECLARE_NO_COPY_CLASS(wxFontEnumerator)
+    wxDECLARE_NO_COPY_CLASS(wxFontEnumerator);
 };
 
 #endif // wxUSE_FONTENUM
index 3a260ce5a2ca6e1a03c98915db245e64aecb8b57..98a799a12b3284fecbb9e881d1265e6c55aa1f55 100644 (file)
@@ -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
index 82588b26e38e23e158ac7bfcb9ac82f51003e4c8..1d1ab9655f70e31292fcc5f79f1f948b8e7446ef 100644 (file)
@@ -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
index 53e83fa2eed854c4703e4ffbf86bbc52eb57dc12..583a5104f6ad6e297d0307b3ad92b69bea8207d8 100644 (file)
@@ -47,7 +47,7 @@ private:
 
     wxString DoFind();
 
-    DECLARE_NO_COPY_CLASS(wxArchiveFSHandler)
+    wxDECLARE_NO_COPY_CLASS(wxArchiveFSHandler);
     DECLARE_DYNAMIC_CLASS(wxArchiveFSHandler)
 };
 
index bd8924cc436dc2cb4af272c9c4b8168a1bebced6..aa47cebb0b6e9d5e209f4555e15a0bc9bb979c35 100644 (file)
@@ -33,7 +33,7 @@ public:
     virtual wxString FindNext();
 
 private:
-    DECLARE_NO_COPY_CLASS(wxFilterFSHandler)
+    wxDECLARE_NO_COPY_CLASS(wxFilterFSHandler);
 };
 
 #endif // wxUSE_FILESYSTEM
index 1e2bd61ca86a2a3a77eea9c2e2fa31c5bab227f9..65660db109927308758c7abf422bacc8b845d584 100644 (file)
@@ -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__)
index 3bfa9a194792ba9ff6fd363ebee7e6e6b7f9e0cf..eaea7137b1b51bedfe12cfd073c30a794489b2d1 100644 (file)
@@ -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);
 };
 
 //---------------------------------------------------------------------------
index 4defdb538e32d6d52763c8a68b7a2c85f036361e..9072ef723001092102ce2669e557f573d38ec739 100644 (file)
@@ -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)
index a48067b1752aa9ed764765a8f2481eaba27e9e89..b75204a2cd79613a71ca7734e718401dd12a3ad5 100644 (file)
@@ -33,7 +33,7 @@ public:
 private:
     wxFrame *m_InfoFrame;
 
-    DECLARE_NO_COPY_CLASS(wxBusyInfo)
+    wxDECLARE_NO_COPY_CLASS(wxBusyInfo);
 };
 
 
index 9ff4e89b54fcbbebede9e7fe246864c3acb5530a..0e97ee085491fe6b19d48ea88f616ea7604d7062 100644 (file)
@@ -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
index e2f637305b811f86ba5f0221040648ca5e34b35a..97b9a8949b9ccdc7d0b9d46a63b458b7d6acab4a 100644 (file)
@@ -86,7 +86,7 @@ protected:
                                       const wxString *choices,
                                       long styleLbox);
 
-    DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
+    wxDECLARE_NO_COPY_CLASS(wxAnyChoiceDialog);
 };
 
 // ----------------------------------------------------------------------------
index c20c7e62535f733e0d8ed2de88b8bbffece79df0..1733342f9095c2004cb0430c11141f2f7572dd15 100644 (file)
@@ -116,7 +116,7 @@ private:
         return true;
     }
 
-    DECLARE_NO_COPY_CLASS(wxControlWithItemsGeneric)
+    wxDECLARE_NO_COPY_CLASS(wxControlWithItemsGeneric);
 };
 
 #endif // _WX_GENERIC_CTRLSUB_H_
index 96419a64fb9b039c970cc62332968759cfe3a824..bf698082e37229e2a0aec3df527e383674796d69 100644 (file)
@@ -522,7 +522,7 @@ private:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
-    DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);
     DECLARE_EVENT_TABLE()
 };
 
index 75172a2d44612a4d4f67e40bbb5b50370e2e3ce5..28461eb130bb9a9b16a07d46c48b6a3dbf7ff8c3 100644 (file)
@@ -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_
index bd09b3c8a6fb4cd8209071a6458981259698873f..7c0640be7df0c2a3c1a44dd4c8354b543c623eb1 100644 (file)
@@ -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__)
index 819128fd04ad83cde0652ae9e386ad9c29b21ffe..f37a9abcc16370596661c872ea174ca834b7c9f6 100644 (file)
@@ -265,7 +265,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDragImage)
-    DECLARE_NO_COPY_CLASS(wxGenericDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxGenericDragImage);
 };
 
 #endif
index 43befd01724c4e2c4bef7ef5f8d86bccacec5efc..cc23938ef4650efc7416709a2cf1a7305cc488ff 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 073d62662b4c60d6ee3d64e648b2acb36f3470a6..a3a8d60c32aece122fdcb21365d8bbe5077a3a5e 100644 (file)
@@ -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
index 58dbddd1eba10ea8d8b75e6b0c7d8a538229d871..f6d3a98c40236ad2975432a1a5d500aa3b0375c0 100644 (file)
@@ -109,7 +109,7 @@ private:
 
     friend class WXDLLIMPEXP_FWD_ADV wxGrid;
 
-    DECLARE_NO_COPY_CLASS(wxGridSelection)
+    wxDECLARE_NO_COPY_CLASS(wxGridSelection);
 };
 
 #endif  // wxUSE_GRID
index 28a73c24b0b18972a03f1008ef363db02a234332..944bd4381525228aaeea21e167bc5ef3627168bb 100644 (file)
@@ -177,7 +177,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxHeaderCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
 };
 
 #endif // _WX_GENERIC_HEADERCTRLG_H_
index 269c65921ad9d8a75994e45ef77f7a03975e6461..83038d08b12a78edbf1be248b41ecd8de83e0eca 100644 (file)
@@ -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
index 15e1513db4cd7b0813e0683ae3790e44ce0a26c6..9f81e2b51f8a14e804a75101b1fee821622ef11d 100644 (file)
@@ -54,7 +54,7 @@ private:
     wxNotificationMessageDialog *m_dialog;
 
 
-    DECLARE_NO_COPY_CLASS(wxGenericNotificationMessage)
+    wxDECLARE_NO_COPY_CLASS(wxGenericNotificationMessage);
 };
 
 #endif // _WX_GENERIC_NOTIFMSG_H_
index 0ce35fb8087d9c66049ad9f2500b8f210a2c518f..da413d2da76a3139fe1a37e35f94a292a9813a19 100644 (file)
@@ -57,7 +57,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxNumberEntryDialog)
-    DECLARE_NO_COPY_CLASS(wxNumberEntryDialog)
+    wxDECLARE_NO_COPY_CLASS(wxNumberEntryDialog);
 };
 
 // ----------------------------------------------------------------------------
index e2ed4757d8bb3f982d9e25df99c443c8e17b7d34..85509d521f8c5e12c486c8f80b089a91eebeb5fd 100644 (file)
@@ -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);
 };
 
 
index aa0de142727c7f34c761711b6aef1956bf1b3974..cf148f8d02735bf9d2123cfbf2018ee2fdcbaa88 100644 (file)
@@ -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
index 480c01ed2519e9ddc0b354491011e0db12734ed5..cbc56178db9fe4242c9d459b75a9003dead2d719 100644 (file)
@@ -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;
index 615aeab40e3d67be37d27bd10a40829db9c33f8c..c4f4a0b292924c12ff274eca5b5bafd3bd12484c 100644 (file)
@@ -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_
index 69d413c4e7e35a0eabfeb92236820d1853b74613..b23e3ea1d5ccb69017c8154b7c7dec782788ef0e 100644 (file)
@@ -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);
 };
 
 
index b96cf678678c0dda6eddd6434616fac5effa7998..0cf27db3bf821b54c4ce3735d7338e8932dc52e6 100644 (file)
@@ -301,7 +301,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxSplitterWindow)
+    wxDECLARE_NO_COPY_CLASS(wxSplitterWindow);
 };
 
 // ----------------------------------------------------------------------------
index d9bdbdcfb7ca1fff77151b011818c323da27cc24..fab6bfeaf442e3a9276d8050c9847e8c11a0a33d 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 486233ad7ce582f0eb08d3e0a138e669de20a2c7..71dea9fc13a3c7bab2639f1e12046d853ddb1e49 100644 (file)
@@ -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__)
index 49f7dd06f582020ea8ebfb89fb2e6fd6e896b68c..43e210c5adc88a62dbd405b2254d436bd32e0b49 100644 (file)
@@ -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_
index 86abb16cd601c2d47918889e52af34cb915d4481..443af47c8b4fa13d3d522377f84d6209503c05bd 100644 (file)
@@ -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
index a00468f6ca4baccbacbb64d57e8da8eb2f353419..cd7ed7fcf084aae9189478ba716b4b06b01e5764 100644 (file)
@@ -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)
 };
 
index 764bf6a0690f181b93387deff04c84df4e8a5205..e9afdfec1766d94998af1732d23970a9c269b634 100644 (file)
@@ -48,7 +48,7 @@ public:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl)
-    DECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl);
 };
 
 #endif // GTK_CALCTRL_H__
index f08f50f26da4967248f88f9bf4839865f519e38c..d197acaf3629d9ce793832d532e57247752a56c8 100644 (file)
@@ -463,7 +463,7 @@ private:
     void GtkDisableSelectionEvents();
 
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
-    DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);
 };
 
 
index b47e1874873929ce515328cd5f75c18cbeba2a58..d19cd557c1fd15c7b9315bbc455e771253a5452c 100644 (file)
@@ -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_
index 7458e01e4eda57bff8e5f50c163f78083e440441..182b5e316b0a2141393dceef1cbbaafd5bd73753 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 5f3b5504f7b5fb146055972f15bd5bc1554c5e2b..faca953d26e758290e94c021ba649c25b0a6793e 100644 (file)
@@ -52,7 +52,7 @@ private:
     GtkWidget *m_banner;
 
 
-    DECLARE_NO_COPY_CLASS(wxNotificationMessage)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessage);
 };
 
 #endif // _WX_GTK_HILDON_NOTIFMSG_H_
index 795cf71ccf91acf466b7ce6088158b3cf027be73..0082aa12db40f094c455f5ea730b4d48a8a2d525 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 404dc081290f29bfe573cd12e67e0b4ec17ff5c6..f007371977d892452cad2c60c8d922dd0f984138 100644 (file)
@@ -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_
index d6ef553132f0b966acc056127a894d6db98472cd..a537667166bf64c89493bf054c6f6534bc6ceb04 100644 (file)
@@ -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_
index f95ef798e2971bc39ad04868541d61894a57985e..88cbc2494e5f1ae08e83b2509578702406e3c820 100644 (file)
@@ -71,7 +71,7 @@ private:
                         int *posOld);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxScrollHelper)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);
 };
 
 #endif // _WX_GTK_SCROLLWIN_H_
index 9a47beab7b997956e8aecfb7906bfa5f307e3e7c..9f6a26f437f64f901614592ede1bb39b835db21d 100644 (file)
@@ -380,7 +380,7 @@ private:
 
 
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)
-    DECLARE_NO_COPY_CLASS(wxWindowGTK)
+    wxDECLARE_NO_COPY_CLASS(wxWindowGTK);
 };
 
 #endif // _WX_GTK_WINDOW_H_
index d89c5b61c9aa63539d55ba4b4e5c3ed63ff12782..1447788a724e5acab8610ea850c8fcb456e7afda 100644 (file)
@@ -50,7 +50,7 @@ protected:
                         int *posOld);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxScrollHelper)
+    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);
 };
 
 #endif // _WX_GTK_SCROLLWIN_H_
index 65c965d13e7db58611c8538fed0ad9d85c071e84..0f5f08f3cdb801dbdf1e047969ac85e284c42ead 100644 (file)
@@ -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);
index 3eb539e9d38b47fbf1955fe08e17008265895cc9..43e9d957e4f50b758fd1d1d07e639e7e588d94ee 100644 (file)
@@ -150,7 +150,7 @@ protected:
     bool m_deleteContents;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxHashTableBase)
+    wxDECLARE_NO_COPY_CLASS(wxHashTableBase);
 };
 
 // ----------------------------------------------------------------------------
index 19ad3fdb49221c9f63f32ed3503a179b209258fe..325c0721968d929c1c2a4e60fcd6f5c252f78f1b 100644 (file)
@@ -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.
 };
 
index 3118ee99cb0dc5459aee136b29e6d502b0107d2e..2d36093efca812975edbfb18f1f4adc3a38a3aa0 100644 (file)
@@ -361,7 +361,7 @@ private:
     unsigned int m_sortKey;
 
 
-    DECLARE_NO_COPY_CLASS(wxHeaderCtrlSimple)
+    wxDECLARE_NO_COPY_CLASS(wxHeaderCtrlSimple);
 };
 
 // ----------------------------------------------------------------------------
index 15328a0ad125cf71819b217bf8a09a28b03fd381..bea865775160fdf2b9304515dfb300a3cb88c1f4 100644 (file)
@@ -125,7 +125,7 @@ protected:
     wxHtmlHelpFrame*    m_helpFrame;
     wxHtmlHelpDialog*   m_helpDialog;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlHelpController)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpController);
 };
 
 /*
index 320235a446e9d4f63c19d901afa02ed6a5190a89..bafab9ecd529e5db9a4aded808bcd4498d30d6bb 100644 (file)
@@ -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
index bca72de3ce6c77ca22426fa5b02600f421228185..578c2c782d9269c7a19bba9c46b5e19a52e74a8a 100644 (file)
@@ -81,7 +81,7 @@ protected:
     wxHtmlHelpController* m_helpController;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxHtmlHelpDialog)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog);
 };
 
 #endif
index c9bae539a0c592b0bab53ef225fa2451bc93f9ce..4bdbbc708d7c226683c688d87dbd5da2644ccf1d 100644 (file)
@@ -139,7 +139,7 @@ protected:
 private:
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpFrame);
 };
 
 #endif // wxUSE_WXHTML_HELP
index fe5d3aa6ddd0b416072f5593926886d6d9d5355a..42f05b5dc0688c4e8542f3e87fdc2be760dd2a95 100644 (file)
@@ -259,7 +259,7 @@ private:
     wxHtmlHelpMergedIndex *m_mergedIndex;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxHtmlHelpWindow)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindow);
 };
 
 /*!
index df6dfa709aa3adc77a0a0659bd27bc954b3a7e63..3e1f9a44afddb404a3a94f4c0f3da41a88df82c4 100644 (file)
@@ -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);
 };
 
 
index 92dc1be5756bc6e8b79846a2a7b06f356c5bcfc0..f4df4344dd4d736b42e0455fe2eef32938b814db 100644 (file)
@@ -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);
 };
 
 
index 38533338666499ad10539a386140e5fb22070cba..46f724cc788f1fcce784c50feb16c38519562b6c 100644 (file)
@@ -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);
 };
 
 
index f9a87235e1ddd1cfc857c9bf65c04f242c08b001..45d55c55bbfc2df1668327f22f3bc9af28e94387 100644 (file)
@@ -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;
index 1598718cc414771fbecc40b0eabf6e6796e6e721..aaa359e64a1109757732a831b90ba8839f407e80 100644 (file)
@@ -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);
 };
 
 
index 5835338889ef28f8d0cf8e20bb3f0f23c087752c..0c9d548c32b19cb9ace30305af96cf1ed18ca311 100644 (file)
@@ -230,7 +230,7 @@ private:
     // expand TABs; only updated while inside <pre>
     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);
 };
 
 
index 22f453c83c45c29d49950e330a48cd5b436e2dfb..45a1765b589de3a4d28326cc3e91231942c9d21b 100644 (file)
@@ -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_
index cead0308847621d817aa0e41c8769cde41cc56fe..d0b2af9d18392e28fa09d6be10caffd80d8f88f9 100644 (file)
@@ -576,7 +576,7 @@ private:
 
     static wxLanguageInfoArray *ms_languagesDB;
 
-    DECLARE_NO_COPY_CLASS(wxLocale)
+    wxDECLARE_NO_COPY_CLASS(wxLocale);
 };
 
 // ----------------------------------------------------------------------------
index ae4bbca0a6c3fa6752830ca2bf24e2195cf71bdb..7619671f104ecae8ea168f9bbf9bd450a6073628 100644 (file)
@@ -222,7 +222,7 @@ private:
 protected:
   bool          m_connected;
 
-  DECLARE_NO_ASSIGN_CLASS(wxConnectionBase)
+  wxDECLARE_NO_ASSIGN_CLASS(wxConnectionBase);
   DECLARE_CLASS(wxConnectionBase)
 };
 
index 51ecad7972bd7314cfabd5bb75e44fce746bc517..b8cc07ea8471f4bdf4b403ea2f26b8119f8f7d24 100644 (file)
@@ -468,7 +468,7 @@ private:
 
     wxListBase  *m_list;        // list we belong to
 
-    DECLARE_NO_COPY_CLASS(wxNodeBase)
+    wxDECLARE_NO_COPY_CLASS(wxNodeBase);
 };
 
 // -----------------------------------------------------------------------------
index fa924a53c44c1f100021b75b79c1c77695a7e737..cc15c6764e46ed44470f7a158bc5549ce5f6af2c 100644 (file)
@@ -111,7 +111,7 @@ protected:
         { return wxNOT_FOUND; }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxListBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxListBoxBase);
 };
 
 // ----------------------------------------------------------------------------
index aa8a00e21649e070069b992f72258eb79fdfe388..cfe6b679e42836b3bc24272defb3f151451b8b69 100644 (file)
@@ -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
index 2b06e8983dd7e6cf609724b42544b66cfbee9bfa..2fdfde9b1993b8eaf03d69a60441a03a160d3088 100644 (file)
@@ -46,7 +46,7 @@ public:
     {
     }
 
-    DECLARE_NO_COPY_CLASS(wxMemoryConfig)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryConfig);
 };
 
 #endif // wxUSE_CONFIG
index 23b7de18d316574a307a49e6d26b15d10edce2c0..475e8fdc23ff5c355cfbdd61f62be8229ea0d9c7 100644 (file)
@@ -45,7 +45,7 @@ protected:
         { return true; }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxMemoryText)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryText);
 };
 
 #endif // wxUSE_TEXTBUFFER
index 1280ea647eb6d7c65325716e8db97b208aa14e2f..4fc2b26f9d73042a3b54662b75a2262182367a1a 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index f89bfe3bc533a05c8f3a255168697cc4a1f6645c..409197a61e7d0b046afa69831dc9f0e21b59e8a5 100644 (file)
@@ -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:
index cc417f9f80575b147fa481e9b7640922a081fd7c..fef8e0a791745429670f4f2b716d472e23340ca5 100644 (file)
@@ -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_
index 12760abecbb788cfd5fe46831d7eac37b94a2868..5cdb38930944c275a17dbc63878ec214d490a2fd 100644 (file)
@@ -303,7 +303,7 @@ private:
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindow)
-    DECLARE_NO_COPY_CLASS(wxWindow)
+    wxDECLARE_NO_COPY_CLASS(wxWindow);
     DECLARE_EVENT_TABLE()
 };
 
index 864569149998265d3592aceaf3d4d70f5bf79abd..7c4329fa39c33755b9c16173932968fee44ad9c2 100644 (file)
@@ -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
index eb5e729ad5888296e4f383a9df58d3ec817bce6f..8e12d632744ffcf5ea18513dd82a2e779848ea5f 100644 (file)
@@ -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
index d7175118e1cb4fda605e8c869162a541671fbb3b..ade87d8c30617b82bf453419cbaf515f3f65ae90 100644 (file)
@@ -104,7 +104,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);
     DECLARE_DYNAMIC_CLASS(wxApp)
 };
 
index d27875cf06b280d57ef4a9178bc48df9fd253267..28384e212f440efe57d364adb497a313fe702ed3 100644 (file)
@@ -93,7 +93,7 @@ private:
 
 
     DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
-    DECLARE_NO_COPY_CLASS(wxCalendarCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxCalendarCtrl);
 };
 
 #endif // _WX_MSW_CALCTRL_H_
index 4a6d28ce83f3308ed5900d6a71eb6631cec69658..d6468eb5b6dd963c8f1c2e027dfd9bc21da1d68f 100644 (file)
@@ -56,7 +56,7 @@ protected:
 private:
     bool m_hasCaret;
 
-    DECLARE_NO_COPY_CLASS(wxCaret)
+    wxDECLARE_NO_COPY_CLASS(wxCaret);
 };
 
 #endif // _WX_CARET_H_
index 00c45349e78f3d6e9c6afbb4fb998320779baf53..9e3780cbfe672e339ec15a934172fddd7a43a327 100644 (file)
@@ -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_
index 908e24bcff8fbf8d3ad5b029968d9f92b16c3eab..0622448279490bec7a5fd872cfd096a82fd2d1da 100644 (file)
@@ -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
index eed5e21e594f3bc94e110b6a14642071dc8109b9..166ace2792f875772ad6238a4deffc43b35be704 100644 (file)
@@ -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
index 5b78fead33222f744a980a452808c55f9da2a2f4..49c5475de22a7c5a76b81d5846ddd22f3b750fab 100644 (file)
@@ -38,7 +38,7 @@ protected:
     void Init();
 
     DECLARE_CLASS(wxMemoryDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 
 #endif
index ee442eddd12ed1a9354d2a84989c45c892713497..9d98518299e71cc78869bce2bce9dd16a2185f14 100644 (file)
@@ -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
index 8635b18afdf9a819c3e376329beeec89a2cec077..8d64f32bf36fe3fb3862f50baa6b0f332a29cc25 100644 (file)
@@ -27,7 +27,7 @@ public:
     }
 
     DECLARE_CLASS(wxScreenDCImpl)
-    DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 
 #endif // _WX_MSW_DCSCREEN_H_
index 9cc5cca987f00707ab2887eecee2d8ddf372055d..b05a4b4fbe4e618ac39b41c06d024da632b0ea5c 100644 (file)
@@ -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)
 };
 
index 98b19aec79767a4cfcce98120ff54fff3c1590fb..02afe5be8aa054fc9687d6592bb6b2632ff9d285 100644 (file)
@@ -131,7 +131,7 @@ private:
     WXHWND m_hGripper;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);
 };
 
 #endif
index 80d27e77d401078cc8651fb607e3493b334cbafa..da33ac07959aa00d82d743b0e87f8f99f63eea4e 100644 (file)
@@ -266,7 +266,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
-    DECLARE_NO_COPY_CLASS(wxDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxDragImage);
 };
 
 #endif // wxUSE_DRAGIMAGE
index b69aa337361c84f485de0de88e558dbe0558edf7..950b061e817b16353117183bbd981a2cc27ee723 100644 (file)
@@ -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
index c00c5b46a4cf6dcbab7bfd1132c82bb6dc338442..c65e422c88af7501b82c060c0b45f32fe141c753 100644 (file)
@@ -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_
index 62203364ae38143981e53c31091545889cc92a00..9f7fd8b34e8ee47cdd7c85cd8556733163ca47c6 100644 (file)
@@ -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_
index 2d5603c332f43df3fd66eb263980c31ddcaa4677..069b73a606153f16cf456bb3a65fb4d2fa278603 100644 (file)
@@ -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_
index 3552d9d5aac77abfd13dc01b0f83835747dd928b..d5f78ffb5f23fee9ee96f01e5d3bda232f491f91 100644 (file)
@@ -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
index 80c794550eae118005dc52285ddfd77e3d9d1811..c500b2ed421017bd5781437c241fd30c0a9dc433 100644 (file)
@@ -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)
 };
 
index 13b7586b0460410305f956d2eba95e4e511c6199..eb5f7bbcdb3948eb07e4234c27e87a7a1a0e61ff 100644 (file)
@@ -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_
index 857f9bed3cd5223c5612a179b22d4285ed6d0c16..a2931c069ccc3bbed9ec78043779b5b4c6c13920 100644 (file)
@@ -146,7 +146,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
+    wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
 };
 
 // ---------------------------------------------------------------------------
index 11cd119760a81738aae9c8680a3788e3b3d3f153..5af79e6c89c97c0f5d1417f7c9d4440cba2df8e0 100644 (file)
@@ -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);
 };
 
 
index 1ed42ae17da7cb16958ead5fda446e4a26dc0bdd..8fd4d7a4e38be85038d3ba363485cdb832956c11 100644 (file)
@@ -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);
 };
 
 
index d39fbbd7c41af986a69615b8d0469490ade6c948..b4459b9aa4df037a2205152eb378c137eca11e5f 100644 (file)
@@ -67,7 +67,7 @@ private:
     class wxNotifMsgImpl *m_impl;
 
 
-    DECLARE_NO_COPY_CLASS(wxNotificationMessage)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessage);
 };
 
 #endif // _WX_MSW_NOTIFMSG_H_
index f5898dea5ea38ea5211f11c0df2f1530fcd61a51..1684ef72b296bf241e011243b7543a38815199ec 100644 (file)
@@ -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
index c119874092df6a6fc07ea66cddfb83ed06a9716b..41db5772842df41743e63b8f41da0d9a78082432 100644 (file)
@@ -94,7 +94,7 @@ public:
 public:
     WXIDISPATCH*  m_dispatchPtr;
 
-    DECLARE_NO_COPY_CLASS(wxAutomationObject)
+    wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
 };
 
 #endif // wxUSE_OLE_AUTOMATION
index a3dca45ea01bc66458a563c9eb8ad202de614568..dc7a89c2f20e38e063f6209b2ac9fd8cf42abb49 100644 (file)
@@ -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
index a22759676bcfd5f624cd24341234d39dfecd01ab..8cda74f5ea0a233cd50b3039b9ff80b9d6c472c0 100644 (file)
@@ -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
index 4efd1b59f2a73cbd77bb70155cba3b63b18201f0..deb5a2e8f19bf73bc7261f45cc0b0bd330b4f7ca 100644 (file)
@@ -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
index 6fc30359c8d2c8b842f89db38d937e90cf3ba5dc..022465563479b9ebd992a2c9535d5d7db43065d7 100644 (file)
@@ -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
index 06754215f34b5d88afa42d9c211fdbd3837eb888..3845d20ff86a506087dea8de03adbc79ec1ff319 100644 (file)
@@ -85,7 +85,7 @@ private:
     void*             m_printDlg;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
     DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
index 7d7e466ed93a75bfb4f228f060a673f58b48a53e..3bcd415ade1c39ab8986352137e560947a089a24 100644 (file)
@@ -36,7 +36,7 @@ public:
 private:
     WXFARPROC     m_lpAbortProc;
 
-    DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
 };
 
 // ---------------------------------------------------------------------------
index 3a0ffc9e75e7a933c7bbc0efbdb1ce4326d3b026..64895d855bd22a4b6693ef49710a7dde5344ab8a 100644 (file)
@@ -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
index 5313b5446edb98a76f9da33f6d6b106bcf877f67..ca3384d43df34a3b5e8ee29e07100b08ef88daf9 100644 (file)
@@ -61,7 +61,7 @@ private:
 
     friend class wxSocketMSWManager;
 
-    DECLARE_NO_COPY_CLASS(wxSocketImplMSW)
+    wxDECLARE_NO_COPY_CLASS(wxSocketImplMSW);
 };
 
 #endif  /* _WX_MSW_GSOCKMSW_H_ */
index a0809e76fcce2e4d53a67708b19c9208f29bd103..ecb9e3efabc4f9b37fbbdea0924570b85d84902c 100644 (file)
@@ -175,7 +175,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
-    DECLARE_NO_COPY_CLASS(wxRadioBox)
+    wxDECLARE_NO_COPY_CLASS(wxRadioBox);
 };
 
 #endif
index d90dec3bb090ce408192a4411dde1abd36972e31..b49c3bb6e1fb417663ccd4f51221eafc306682a7 100644 (file)
@@ -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)
 };
 
index 5ef5411264c1d369db53a5219dd47b2c0cd5a00c..654290ea2f2c8eb96e59d9da19bc0510cea3a640 100644 (file)
@@ -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
index 21a71d0e77260c542a9f7a0023e46acadf55d9da..47a69671565fd3cdfe58392df199d564179c8e5c 100644 (file)
@@ -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
index 8f200c0267879b1c38ac2be2ea5faea850d81274..036ac2b1f353011e60afea6f8a148d9def48d44f 100644 (file)
@@ -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
index 7989fce4bc7bdc0b9c3c98261a80c485dedb116c..71cffec52beb5e95f152ae61227d1da8f70782ac 100644 (file)
@@ -86,7 +86,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
 };
 
 #endif
index 27f5f714cc170a1b7b6eebbcbf11d4b819232c93..2c877186eb5099304d918a97789393951a666de9 100644 (file)
@@ -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
index eee0096c9740ba1bd7660ac9fe701713a62dfb44..c27271ca6060a3e71a89eba8f907950150dc3e51 100644 (file)
@@ -51,7 +51,7 @@ public:
 private:
     DWORD m_slot;
 
-    DECLARE_NO_COPY_CLASS(wxTlsKey)
+    wxDECLARE_NO_COPY_CLASS(wxTlsKey);
 };
 
 #endif // _WX_MSW_TLS_H_
index 7a689eba01d401d620a3986988096f3314a078ee..b835541e802713268708da73f754b3cfc27d05bc 100644 (file)
@@ -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
index e8a086798105337d8e3eedd2257849f0cedbfe20..7575d5f3b02053e9b16361a3d27ac148b6ef1610 100644 (file)
@@ -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_
index 1af76489f9729200e01be6915cf2172555cc5a6a..43721fa25fe4921d097508df75562b8c8ba6c494 100644 (file)
@@ -206,7 +206,7 @@ private:
 #endif
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
+    wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_
index ad8d31210d6f4ba2575c6257c521ce0a92a5a7d4..31eb2469f1ea416fab87e2dde223e915c2fe0542 100644 (file)
@@ -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
index 53aca8a059c2d6915425ab8c3ff175ae9b52e387..6424fc6118606889db825b6a55f9fb8329a70985 100644 (file)
@@ -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_
index 9d9244276537f69b62e741b83ed617baf2b2b519..8b4618e2a4298d2988f91a0cd1fc88e446539747 100644 (file)
@@ -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
index 61f2bb4ae417e6c5abff8f8a3380f20d9aec537a..9ec35ebfa434b06c0c8cf40e1282ee64a27f92b3 100644 (file)
@@ -573,7 +573,7 @@ private:
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
-    DECLARE_NO_COPY_CLASS(wxWindowMSW)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMSW);
     DECLARE_EVENT_TABLE()
 };
 
index 195ae3f374cd0f301579fb876fae7305a12d51a7..163f96b0a22835fc0271c82db6de6f8b2a2e3045 100644 (file)
@@ -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
index be24584745b6fb9e1e618e4f9c0291cb15e77a00..f38d8e978f9a96416edb193840f64b0b9bd5dbd8 100644 (file)
@@ -159,7 +159,7 @@ protected:
 #endif // __WXMSW__
 
 private:
-    DECLARE_NO_COPY_CLASS(wxNativeContainerWindow)
+    wxDECLARE_NO_COPY_CLASS(wxNativeContainerWindow);
 };
 
 #endif // wxHAS_NATIVE_CONTAINER_WINDOW
index b636d5910d1db67f909fd4b78c9ca62731f1e7be..96278d07d393b3b39bca600ee914e0caf37cc9bf 100644 (file)
@@ -104,7 +104,7 @@ public:
     virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
 
 protected:
-    DECLARE_NO_COPY_CLASS(wxNotebookBase)
+    wxDECLARE_NO_COPY_CLASS(wxNotebookBase);
 };
 
 // ----------------------------------------------------------------------------
index 46288e62e115ad40024a63b7c61dd4f3e8eae47f..fa647209556c7f5e200ea9692aae1c2ff9e884c0 100644 (file)
@@ -124,7 +124,7 @@ private:
 
     int m_flags;
 
-    DECLARE_NO_COPY_CLASS(wxNotificationMessageBase)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessageBase);
 };
 
 #if defined(__WXGTK__) && wxUSE_LIBHILDON
index 0f2f72b3f740dcc1c5c593e732fd44e1920b9d40..b5f34262d63739fc241dd31fb733da926f880de0 100644 (file)
@@ -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);
index 26716011af35f795c3d835a65815b6df0da983e5..93c1dd37d6def6c5b3cad46bc599908eda406010 100644 (file)
@@ -118,7 +118,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);
 };
 #endif
     // _WX_APP_H_
index a69cbd7126713093168ed59f10bff232bdd3ec06..3f0c81fc4acdaf7f91694cabf474db619635f778 100644 (file)
@@ -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
index 62b9923d2dfd78d3ac9d34907dd976f1312baade..10ca985c09b3618d6436a82fa802b2593b1b00c7 100644 (file)
@@ -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
index e967827cbe23b01678815b64c28a2dda6ee0b854..6418f99a312bc661b5c658f4c364c3462ec7fdda 100644 (file)
@@ -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
index f10fc0058d7532a5a4a1b202b2854ee845a9d616..49435267f94e1c3071e70f77eff70c990f040c31 100644 (file)
@@ -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
index 49898cbf7f23aa0b4df78c355364bef98dc191fe..5555122df42fb2070d9bacfb55c1bcde59b2f9d4 100644 (file)
@@ -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_
index 08910649fcf9f8390d7a6bb464b597467d7f5741..ddece5a697aad61587522fbce6d2d83910d39105 100644 (file)
@@ -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
index 27f04a66042ac38d8b3b9b9a7f659e356f6672ca..ada95467051e6b3ddf8d1a50af7ba3eb08af78a7 100644 (file)
@@ -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);
 };
 
 /*
index 9746f3cf9383a431eb8344799edeced5e46b65fd..4c22721fb3412e4381066419db2d2f8db2d1c5e0 100644 (file)
@@ -54,7 +54,7 @@ public:
 private:
     ULONG* m_slot;
 
-    DECLARE_NO_COPY_CLASS(wxTlsKey)
+    wxDECLARE_NO_COPY_CLASS(wxTlsKey);
 };
 
 #endif // _WX_OS2_TLS_H_
index 6b81a772927dbdace358d4473918d537e74de694..4a99d302bff97e1118405d44134f430914a35d0c 100644 (file)
@@ -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
index 6f2294c6b5a6bd1890cf81bd397a44f355ca7856..14e664fa69c6066dabbeee5dc2ff1d9952e70184 100644 (file)
@@ -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
 
index a642ed6e82e4fd711d9fec5a1d1fd59be0d5ba84..2cdaf00c348c3f4fc99d97e6695fd031ede74d0f 100644 (file)
@@ -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()
 };
 
index f6ed9b27ec63faf920f14a1475d3e1bae5ca4733..d4a25caee50ea8f5dfa8138870e0b4a06b9f7701 100644 (file)
@@ -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 )
index 3c677f99ad316604e43cf4d9199f3696e6a1d352..a039a144ef55b9a7e1a6ae7d022b5819cbc8047d 100644 (file)
@@ -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);
 };
 
 
index 6e4f1e0845cb061c2ea6c7f45cafcd5d015cfa88..382d79b01c580d40f374951caa495b55e2f4bab5 100644 (file)
@@ -39,7 +39,7 @@ private:
     wxBitmap  m_selected;
     
     DECLARE_CLASS(wxMemoryDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 
 #endif
index cf6c925ab6c4f900acf0ac0489356f9be93b1c1e..f23c4a6f76d60fa1e07b36fb303dd7f5d7d714c2 100644 (file)
@@ -27,7 +27,7 @@ private:
         
 private:
     DECLARE_CLASS(wxScreenDCImpl)
-    DECLARE_NO_COPY_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 
 #endif
index 2d032aaad73242f964276a327a3af74efa97ca4e..9f2d2ca9ff21bf3238102bc351a28643381b45c4 100644 (file)
@@ -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
index da6e0ec509fd27a1e87c09a60021f858ead40a6f..07c93e82621281711259c2193a8a74d157351a88 100644 (file)
@@ -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);
 };
 
 
index 999f126e8aa6d316dfbaa3a8ba59fb53c2bae8c9..d228363115335f7786e1de45722e93bda268da95 100644 (file)
@@ -338,7 +338,7 @@ private:
     void DoUpdateScrollbarVisibility();
 
 
-    DECLARE_NO_COPY_CLASS(wxWindowMac)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMac);
     DECLARE_EVENT_TABLE()
 };
 
index 831fd8f1bafe4fde7b01d24ead24e43e4812d86f..2c00fcb89766e7ac91dc5ce38219349c5b5b0875 100644 (file)
@@ -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_
index 84d740ea64689da1f9f760bdb1ebdc9e17f7753c..292830482d482c547fe8225002995fc6b00ba277 100644 (file)
@@ -74,7 +74,7 @@ public:
 
 protected:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxApp)
+    wxDECLARE_NO_COPY_CLASS(wxApp);
 };
 
 // ----------------------------------------------------------------------------
index 0221481407179b89150def7e763aba29002e9f67..73a85d000769a3973c48f0383341b8717ea3d124 100644 (file)
@@ -56,7 +56,7 @@ protected:
 private:
     bool m_hasCaret;
 
-    DECLARE_NO_COPY_CLASS(wxCaret)
+    wxDECLARE_NO_COPY_CLASS(wxCaret);
 };
 
 #endif // _WX_CARET_H_
index c3170a5de48cf74f3b9cfb38997a278b3ef73753..07565d3b4f133e0f63c41b93010f1047a9234695 100644 (file)
@@ -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
index d45b754e44a1260a1b751f267ced68738e74adcb..2adc68fb5b790a4cd7321f60eff24feb87d80d3e 100644 (file)
@@ -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
index 59b69f98596b959ca57eb38e920cbc93f9fd79b8..96429f43b81c2c2f197bd437ee69b452dff094d9 100644 (file)
@@ -36,7 +36,7 @@ protected:
     void Init();
 
     DECLARE_CLASS(wxMemoryDCImpl)
-    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 
 #endif
index 986247f701347f4f4c08ea95216b81cc47f80b51..cb9f6a2649e0a3fa9dff51c6daf86e242c660d3b 100644 (file)
@@ -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
index 9fd8edeb767d0495433d2fa7fc4a324a8618fa03..e8f66f58c08c005f3dae49276516f91920e1deea 100644 (file)
@@ -82,7 +82,7 @@ private:
 
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);
 };
 
 #endif
index 774dd768b40ea25eb746fe3645a0bbfeba0d2215..bf98c42852221bb538a0b630d888b3199671a69f 100644 (file)
@@ -255,7 +255,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
-    DECLARE_NO_COPY_CLASS(wxDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxDragImage);
 };
 
 #endif
index 70c0c924dae3595445856750bdb5fb8a195ab522..31feac555759de69d70d09933803b21e455cdeb0 100644 (file)
@@ -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
index e28870f29ae9963ec67c63b96fc029fa02b6689b..b6e66481d196bd4719408f71fb026fbb8c1bf56f 100644 (file)
@@ -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_
index ca9ecafbd2ec81f29bb4ad491d1c348053876799..e7ce26b98a977e50a4324fe9888df297710c4b49 100644 (file)
@@ -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_
index 88372b49ade151a20dfbb0c70d2961c38730bdab..91a6eaf5e4da64e537b4e91369122ae3e081a33a 100644 (file)
@@ -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
index e4d3f07c86f8ac7ec6a257822fbd12266e99c56d..97bd63b30fe2a8689f42f40a753def44216f3eda 100644 (file)
@@ -103,7 +103,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
+    wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
 };
 
 // ---------------------------------------------------------------------------
index e337c0c7e341a76e4362aabce899565dec6b9979..c38168cb6a6814fedc2638a3a9e8766897fc3267 100644 (file)
@@ -27,7 +27,7 @@ public:
     virtual int ShowModal(void);
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-    DECLARE_NO_COPY_CLASS(wxMessageDialog)
+    wxDECLARE_NO_COPY_CLASS(wxMessageDialog);
 };
 
 
index 7381b3381f584ae20efb36306e4a503cd07884bc..58eecece9ec94410a8b8746569cbe5c38fb98395 100644 (file)
@@ -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:
index 1ca9a013ee70f4b87ab3d2d24d92fd26b11ff71a..6f7a5af4de92dd0588c87df234c1d67a6d217491 100644 (file)
@@ -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)
 };
 
index 9ba71df71b99613320ce6538803d7fcd803dcda4..67cc38ac9b5209eaed67a6a8a9598a73151a00b6 100644 (file)
@@ -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
index 545643082bddc1b6d81343786a6d396b26a7e157..c16ea5ec27a6d2dd022461ec33012880ca34e687 100644 (file)
@@ -35,7 +35,7 @@ public:
 private:
     WXFARPROC     m_lpAbortProc;
 
-    DECLARE_NO_COPY_CLASS(wxPalmPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxPalmPrinter);
 };
 
 // ---------------------------------------------------------------------------
index f37db2e9e01e2264c131f44fdd6544ed0d51c302..d3f4c0ca147e1d620def7c50b0c8c0ea5805721a 100644 (file)
@@ -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
index e0b2ec666bb1f7a06b5ec039bfff6620b20deca9..d77fce4bfeccfdd126a6223408bbce4688124c57 100644 (file)
@@ -163,7 +163,7 @@ private:
     wxHashTable m_radios;
 
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
-    DECLARE_NO_COPY_CLASS(wxRadioBox)
+    wxDECLARE_NO_COPY_CLASS(wxRadioBox);
 };
 
 #endif
index 7b813f5b610c447b8b52dbad73026695de42d530..9322b2031d868e4c79f1d477781158063a7d4e78 100644 (file)
@@ -44,7 +44,7 @@ private:
   int   m_waveLength;
   bool  m_isResource;
 
-    DECLARE_NO_COPY_CLASS(wxSound)
+    wxDECLARE_NO_COPY_CLASS(wxSound);
 };
 #endif
 #endif
index 677c3406255d9667d03d14299136d62eea1ccf73..912eb5532c3aeeed449aee6b9d41d6b48ebb381f 100644 (file)
@@ -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_
index b54ec30d9cf2156bd99e47be6c746e9a11c02613..556e85348336600205464fd0eb2212ac8a887220 100644 (file)
@@ -93,7 +93,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
 };
 
 #endif
index 27b9291093e12547c249576e53abe7dc5ed7e118..a0db54f1c3c98235e56897ad172457a2166758a0 100644 (file)
@@ -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
index 31b05273cc61fd8cdc8c838601155aa15182bc6d..447dd4d9a8b582ac58c8cbb019b9784c2e37ce3a 100644 (file)
@@ -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_
index c6909432597c95f52183885df5d553adf3667494..3879c63bae2ff84c9f61bb9da257d8224a5db62e 100644 (file)
@@ -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_
index 9349196ef706de179841f85ad70f53f6836ec049..6056ae385009a793fdd9598c667d8abfa0b72f20 100644 (file)
@@ -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
index 354d8173c7d2252f09a217aeccfa23ec4a5f6340..f95bc1e347b3cf5774de14330a1c32ecfea0378c 100644 (file)
@@ -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()
 };
 
index 02c9607c107b4af3adf0c6a3eda90fc01088bad8..a46935fd90c17b6a6407fee24e3d1bafd7885d52 100644 (file)
@@ -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,
index 692e143a139e3f6942322c7e849fdfffd8a148b7..01ff6489d13157119cfc3eebefd3836f1ecb71c3 100644 (file)
@@ -64,7 +64,7 @@ private:
         wxPersistenceManager::Get().SaveAndUnregister(GetWindow());
     }
 
-    DECLARE_NO_COPY_CLASS(wxPersistentWindowBase)
+    wxDECLARE_NO_COPY_CLASS(wxPersistentWindowBase);
 };
 
 template <class T>
index 372bf523d4a14a75e01b4ad7c56c25aaf7725f81..8edf59c74fb6c8fded7a8c32fa4f03ea8f045cc9 100644 (file)
@@ -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__)
index 18892799046cfd5f50fd4231c9a88ab557bfa78b..757f822eedcb1a8b18ce4da8b8438ce00f48d6fa 100644 (file)
@@ -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
index 8567852a87a653694333df93311781ae0b9c2f68..898c37c0935cbd405de6660e7e6c6a7f74f98652 100644 (file)
@@ -75,7 +75,7 @@ private:
     wxBackingFile m_backer;
     wxFileOffset m_pos;
 
-    DECLARE_NO_COPY_CLASS(wxBackedInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxBackedInputStream);
 };
 
 #endif // wxUSE_FILESYSTEM
index 0e2d15ae9111a7e5493ea7ff8ff5f4e983bf4789..936eb13b5eda7f363dfd23241d6d58199a38bcd8 100644 (file)
@@ -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__)
index 5178b3cf0ffd0d8e39ede66f3e673ee7ec69a5e7..ffc2758a7243095cc1da2e35f696a342990321f0 100644 (file)
@@ -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_
index 031f638afad911ef9b56276a00c8c517a5386400..0a6aecaa463496189fed5bae1c81e974baa4962d 100644 (file)
@@ -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
index 99dd8ab20e34ce23630f2653ada3cd2dd6a22191..814f3e06a51302631cbbd7179c1ba0ac0cfc4336 100644 (file)
@@ -123,7 +123,7 @@ protected:
     bool m_redirect;
 
     DECLARE_DYNAMIC_CLASS(wxProcess)
-    DECLARE_NO_COPY_CLASS(wxProcess)
+    wxDECLARE_NO_COPY_CLASS(wxProcess);
 };
 
 // ----------------------------------------------------------------------------
index 6bcd4b893b1071a779a04e3fc9b67a5ae40829fd..1e99661b1e086ca489001cf2909ba309c4cfeed3 100644 (file)
@@ -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
index 012d830b4e45a567be3c5eb2512e85b2686dcf8f..f26d22ba8910f2bf752b557ad1f12ec231c8a6b1 100644 (file)
@@ -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
index 737671db3bfeb8756a26739bff8f9f62ae7e8eed..de7fbb394c7945fcce470df6a94ffcbed5731a12 100644 (file)
@@ -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
index b2bb8e2eb773cce7cbebae8784ecc730fa2f1481..fed5b7f699d6bca86dd8ddf68c793cf6fc56422a 100644 (file)
@@ -458,7 +458,7 @@ public:
 protected:
     wxRendererNative& m_rendererNative;
 
-    DECLARE_NO_COPY_CLASS(wxDelegateRendererNative)
+    wxDECLARE_NO_COPY_CLASS(wxDelegateRendererNative);
 };
 
 // ----------------------------------------------------------------------------
index 798aeebe573e4b45d9c8ab6f5cff0356227bd744..dc7b0c2ac939d695edcb4149bc9df9a98336c139 100644 (file)
@@ -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
index 3c36c49b78b4fbee72d5030f70ea91f5f5111c07..739e8606eeb718733c5e40066acd9d333e4250e5 100644 (file)
@@ -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)
 };
 
index 11e612c2273f47611bedefc8cf378a2dd7da0f41..6eccefc84a5cfd6af0fc959ed0761f9c3cff2a30 100644 (file)
@@ -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)
 };
 
index 60fced8eb222c4fcd23ce43efebdf2236a49ffc2..7018209199b6543666ba25ae52acea2e2851a06a 100644 (file)
@@ -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
index 4fd9e3d0648cf5988eed8ac0f26398b2c852729a..2d01bcae4b3ae03bb537fe1672e436219f63b435 100644 (file)
@@ -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__)
index af3ef755d5385de03b416f8b760cd1897477e244..f209507d5f226c24009d9cc913d652b6ee01034e 100644 (file)
@@ -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
 };
 
index b72d10f9905c65a79140f42ec5144f074f24d942..f82d1ac5be994b0eb3d324ae1e0bea728ec90d35 100644 (file)
@@ -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_
index d65663d1dbce4f079422c29ee64f0d62f4c6bd04..26a32ba3ea9faa6eda58a884f9d1f7b5cc95e912 100644 (file)
@@ -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
index 7a92223486d1a6445204fa7159fdca37039c448b..eeb04a138a0d368802e2bd24c9b7db6449c21eaa 100644 (file)
@@ -118,7 +118,7 @@ protected:
     }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxSliderBase)
+    wxDECLARE_NO_COPY_CLASS(wxSliderBase);
 };
 
 // ----------------------------------------------------------------------------
index a06004836081cc063b95cbabccc2decf94eac41b..a8f508aefbbecb32c2acb6693388b51462954c85 100644 (file)
@@ -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
index d7dca131b48bc9632949498a95e66ab2499004eb..e6b11b1f255f4f60fab40aa1f5d8cb4816bb882b 100644 (file)
@@ -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)
 };
 
index 94402564ea5b7c9414813e507263db79fda8e24b..53e84ea68f6fd59b356bdc36f5a8097e1c986e07 100644 (file)
@@ -65,7 +65,7 @@ protected:
     int   m_min;
     int   m_max;
 
-    DECLARE_NO_COPY_CLASS(wxSpinButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxSpinButtonBase);
 };
 
 // ----------------------------------------------------------------------------
index ea70a0c93bcfbbd2be8333f4e997545f7c3be8e4..489f076d8178d8b2ad7a693fdfa324c741024d02 100644 (file)
@@ -55,7 +55,7 @@ public:
     virtual void SetSelection(long from, long to) = 0;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxSpinCtrlBase)
+    wxDECLARE_NO_COPY_CLASS(wxSpinCtrlBase);
 };
 
 // ----------------------------------------------------------------------------
index 61ac6044d52426f3fa1267e86932dc7644e2f45d..8b202b0045535a389f89edf48cfb668554c56df6 100644 (file)
@@ -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
index 9278aa0974d5c74297c07c2812dcdfdc56786561..ec229a832943ce5f54debd81d0a06bce55b49f23 100644 (file)
@@ -50,7 +50,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase);
 };
 
 #if defined(__WXUNIVERSAL__)
index 203790654a6e0875a5632d66ba9a2d86e71495df..2b3683d3d722a933eac3d39fba5ec5ae9f51a67a 100644 (file)
@@ -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__)
index 9cdd7ffd2e8e726efc1bc3590ff47260150944e2..38941691182611d4683a4afe3792847e108c106d 100644 (file)
@@ -76,7 +76,7 @@ protected:
         return AdjustSize(wxDefaultSize);
     }
 
-    DECLARE_NO_COPY_CLASS(wxStaticLineBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticLineBase);
 };
 
 // ----------------------------------------------------------------------------
index 73c1c93fc5fd07fb47b2c79ccdf606d5430e3be5..f8d7ede736f1e583001f94456e22f2eb3f91a076 100644 (file)
@@ -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
index a5593c27cf92a79a7a26d0df3c2b322a7a3dc0f0..49ae99e24ec2dd96530d89f40a11ff68b828c674 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 74e871324b109935cb56a583297688accc0f514d..cf538d1491ee437533c452d0f77966fa3ec30589 100644 (file)
@@ -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__
index 3f34c95212d769ef59f8c085a919fba75129b518..c2cb838f922a6ae689cfe900d8fce8bf0fc42edf 100644 (file)
@@ -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
index 22e0ec6f5ed19560e82abd04b1a09edd7c0c6e65..b6cb7836b331bc57bfc9fa3268d5fd162b3fd767 100644 (file)
@@ -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<typename T>
@@ -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<char> )
@@ -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
 
index ed16e5ed90fc5f5e2d2352debcd348b7181aeab7..e81a083a61dcab04e42e70b76e183f68f167388d 100644 (file)
@@ -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
index 5043c5f29e8c43145a5c09409d1b395e3eca86db..44087ccabd9ea6ef7af4a5a53c067bfc901a02d5 100644 (file)
@@ -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);
 };
 
 
index b67607bbe45a64e7b26215e3820c97f43e43201b..8c789f09f457b3ff75567e6f4f13d466ef40941e 100644 (file)
@@ -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&);
index fc09d4658610474b90a14229396f099242e2f61f..d13bf223332271030622726b9d1eedeacec77ec7 100644 (file)
@@ -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
index b515d9e866eed9ac7e93bf4262a66a2d2bebd9be..c1fb7706322d797d03a951559f1214a3cc7f7c10 100644 (file)
@@ -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)
 };
 
index 588aedd24ae40a1d732c9f40f0454e277a5d167f..240817cfe289e72e92d6ada3dedbe3334019ba63 100644 (file)
@@ -46,7 +46,7 @@ private:
 
     wxFile m_file;
 
-    DECLARE_NO_COPY_CLASS(wxTextFile)
+    wxDECLARE_NO_COPY_CLASS(wxTextFile);
 };
 
 #else // !wxUSE_TEXTFILE
index 614a4ed0b9d47c91f3dddd2bfdda0214674fc90f..d7546f1f444c226e909b63a6a0ccbaf4be68d491 100644 (file)
@@ -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);
 };
 
 
index 999d4f91665f3dd1f7093d04b63c3686df3c78a5..fc0ac2759c1bb6ceadf1bdbf1a821634707ffff9 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 71942ba27db15391c48bb12471580b88775ee3f6..6664ce7ee477504ae11731fae6138c22d27474d9 100644 (file)
@@ -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)
index 21f8ece1edb74dfe84b42cc8d9f7efd32df1b2ae..0b9a63b0825b9a0596a065d76ef059bea93af8af 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 6b448ec1017af0d3d05243e9789b6f2a3ecfe1b0..a805fc6b6606763dcc1ac632c0294c6ceef05a54 100644 (file)
@@ -90,7 +90,7 @@ private:
 
     friend class wxTipWindowView;
 
-    DECLARE_NO_COPY_CLASS(wxTipWindow)
+    wxDECLARE_NO_COPY_CLASS(wxTipWindow);
 };
 
 #endif // wxUSE_TIPWINDOW
index 2421a6eb23fe10aea28ce63d2541a943d5828ac8..c8bd227475047e091a8c86813c59d6d1c351fbcb 100644 (file)
@@ -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();
 };
index 77a10793c7c5aecf9de08e14af4b24b9fe08edc9..81e24a8e8c43881ba8bfb392bac31b1e627749a3 100644 (file)
@@ -438,7 +438,7 @@ protected:
     bool        m_quickBestSize;
 
 
-    DECLARE_NO_COPY_CLASS(wxTreeCtrlBase)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase);
 };
 
 // ----------------------------------------------------------------------------
index 0c3983799c2a0a25b278d1988268af66ecda7ef4..d9d339941594d2155e02d4c0955ae8574329a778 100644 (file)
@@ -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
index a6be61336d2d1474f8e0730ab5a5950ad37a54c5..2fd6a5e351ea0e285eb3c1755cc41f0f74190176 100644 (file)
@@ -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_
index ab5a5f9a409e110ce52d64800e9cfda837bd91c5..42d16625a9f7fb16b04b48ddee5df295e7501584 100644 (file)
@@ -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
index 5f5744c16426d46545bdeff1d3abcd752762ceaf..126ccd2b17be80bf0139d84a47a244c24c6cab42 100644 (file)
@@ -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_
index 3d50a61ad020ee2cff5872200e5f13f7f4c0b62f..6f6ad149c69687729ab3ea27a51a51902a7146b7 100644 (file)
@@ -634,7 +634,7 @@ private:
     wxWindowList *m_winDisabled;
     bool m_disabled;
 
-    DECLARE_NO_COPY_CLASS(wxWindowDisabler)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDisabler);
 };
 
 // ----------------------------------------------------------------------------
index d3bf35d7b3d2e1d0363898f4df3fef05c6513499..63324a19627011ed764c13302d8a22e31c58ebe6 100644 (file)
@@ -76,7 +76,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxGenericValidator)
-    DECLARE_NO_ASSIGN_CLASS(wxGenericValidator)
+    wxDECLARE_NO_ASSIGN_CLASS(wxGenericValidator);
 };
 
 #endif // wxUSE_VALIDATORS
index 353dc85dfef5c2e05d528b0c432f3934fd94a702..55005f9d8776b3cd068752b1d7adbb48de2fc835 100644 (file)
@@ -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;
index 955a7f38f80cd0f1149f444922213f0056305922..34efdbea5a2874113133c2c709c0b275980290d3 100644 (file)
@@ -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()
 };
index 6ba94b42739799532c8a0b64b443b0c74aa329b3..9556033827da85a2fec7520f31c350e6e3f80215 100644 (file)
@@ -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)
 };
 
index e80c42cd7b4d3f12475fdea060ce2ecf051a6cae..d2ebbdc5086e07b22b6bf2fd0de751023eed047e 100644 (file)
@@ -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)
 };
 
index da1e7c2d8792af3089b5f72c1b23e5958c978fff..9a2fa60ba7dcd54b328f4400d94087a2bc7769de 100644 (file)
@@ -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
index 06d52fc8351e41e278da2ab401412acc05cbd7f9..cc879cfd98a70b09f402a38e91e4b30ff2063dd9 100644 (file)
@@ -1703,7 +1703,7 @@ private:
 
 
     DECLARE_ABSTRACT_CLASS(wxWindowBase)
-    DECLARE_NO_COPY_CLASS(wxWindowBase)
+    wxDECLARE_NO_COPY_CLASS(wxWindowBase);
     DECLARE_EVENT_TABLE()
 };
 
index 494dc493898aed3503f6e3f63bab7986c2e323c7..e0d2296a8ae813cf9bc102293076f88d2d56a787 100644 (file)
@@ -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
index cc1b423e9e45d7e9106af20be0626b7d393c6802..0c1b71022d75ae15c64e54551c031de355fa59d6 100644 (file)
@@ -30,7 +30,7 @@ public:
 private:
     wxWindow *m_win;
 
-    DECLARE_NO_COPY_CLASS(wxWindowUpdateLocker)
+    wxDECLARE_NO_COPY_CLASS(wxWindowUpdateLocker);
 };
 
 #endif // _WX_WUPDLOCK_H_
index a4353eaf9d0ac851fe77a274cdf387e7cfcdccf2..a958feb093719004a2b19ec4f6fa75235da99eb3 100644 (file)
@@ -190,7 +190,7 @@ private:
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindowX11)
-    DECLARE_NO_COPY_CLASS(wxWindowX11)
+    wxDECLARE_NO_COPY_CLASS(wxWindowX11);
     DECLARE_EVENT_TABLE()
 };
 
index c0d5d4f84bc2981ca9f87e2a6c9df670fa3de3bb..64b6e53a178f6e13f963e601fbfa77e434d36dc2 100644 (file)
@@ -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
index 41c24517f732c3c571f2dd0954d201b9843e4598..ad53a5d129d12ae94171be4a2115239d10d303a4 100644 (file)
@@ -1826,7 +1826,7 @@ protected:
     void Register();
     void Unregister();
 
-    DECLARE_NO_COPY_CLASS(wxClassInfo)
+    wxDECLARE_NO_COPY_CLASS(wxClassInfo);
 };
 
 
index 5d3d67530dcb055af875835b041de16d152e86bd..618403f95c9a16288f94b60821e38a230154f368 100644 (file)
@@ -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);
 };
 
 
index d6c473080ba4c73a43b8f17d72f7d6e700d4e5fa..ae7e4124fac464dc2976b886f8c305319ad51500 100644 (file)
@@ -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
index 77c1148ce706dd05a5e964a134faec1dfa7049d7..63e815802b404292a3c5cf2946608c197688173a 100644 (file)
@@ -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.
index 0e3d76e487a7f0fe9b632dfe5955e0fedf21f2f8..443ed90f72a9428b00ecc3ecb1c0cf68278b57b3 100644 (file)
@@ -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);
 };
 
 
index 15133706cf2a874c6e7ca5e70e1c0caa68bbbf11..61f58a139410ff5e0d214b92fa5a08c8c1b4347c 100644 (file)
@@ -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)
index 15f1d8964abd53fb01889921f63cfa979aee790b..59197b76427b24fac1cac703bb74e593e3afec58 100644 (file)
@@ -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)
index 19605e1a2c7189b57491c85bea6a28251e4e244e..52630093d158d34deedb5f7ce93e842df4c96145 100644 (file)
@@ -228,7 +228,7 @@ private:
                *m_chkCentre;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(TestMessageBoxDialog)
+    wxDECLARE_NO_COPY_CLASS(TestMessageBoxDialog);
 };
 
 class TestDefaultActionDialog: public wxDialog
index 280f1656c0d4aa5ccf55b13c6031baadba9240e8..8365009d5cde04a245451558c2d32f72e007dc6f 100644 (file)
@@ -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)
 };
 
index 81357a0a301ada298a179aa1a18c17c29308ea00..c3b91f3d4b832e1ed94747f17d193e40e30b706c 100644 (file)
@@ -80,7 +80,7 @@ private:
     wxMenu *m_menuEdit;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
 DECLARE_APP(MyApp)
index e0467ef5b9ec93bfc222758e2a73de35f168a5b2..b0dc87bedcbc4f230035b9a8c310e08056941eaf 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 5472db618d646fb1b2d90ce37e42c75af210fad7..f796fbd2f4447dffeb502b0112b537ba0db72eaa 100644 (file)
@@ -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()
 };
 
index eb4ccdb014b70153eb0f8759f4ee9b923c06b91f..41817204c7165dbc1b07bbc4533dcc38b96f0b78 100644 (file)
@@ -95,7 +95,7 @@ public:
     wxTextFile m_file;
 #endif
 
-    DECLARE_NO_COPY_CLASS(MyHtmlListBox)
+    wxDECLARE_NO_COPY_CLASS(MyHtmlListBox);
     DECLARE_DYNAMIC_CLASS(MyHtmlListBox)
 };
 
index 176bc81b428f4c33e15e96df15cbf22cd4688565..a0655c2d8471a54a1ad7b78709554b2f7d44137d 100644 (file)
@@ -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
index 80581e576082ede9aa3daa563ccb194cc635f04b..4d8025fedb1351dd214e8f853ff603c3c1b2acd8 100644 (file)
@@ -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
index 26e1c6cf07ee20cfadb48f8d3a60ad2ddc524116..f21382594d8b83e66763896cd5b0aee988e3391e 100644 (file)
@@ -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()
 };
 
index f1f7519fc89c9ff8a1cb69b44b1cc934052d6535..75e6c48d528523be7cfd0a79bca8392515c7dd8e 100644 (file)
@@ -70,7 +70,7 @@ private:
     GLfloat m_xrot;
     GLfloat m_yrot;
 
-    DECLARE_NO_COPY_CLASS(TestGLCanvas)
+    wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
     DECLARE_EVENT_TABLE()
 };
 
index b5aae0eea17088e043e9b076e1b774e6868d34fc..3f2559090719e8abcac7c56b3aeb0910dfa0bb2f 100644 (file)
@@ -100,7 +100,7 @@ private:
     GLData       m_gldata;
     DXFRenderer  m_renderer;
 
-    DECLARE_NO_COPY_CLASS(TestGLCanvas)
+    wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
     DECLARE_EVENT_TABLE()
 };
 
index b57cb61979d8baf73386409da50a7275a8701902..a25419d30e7bd59289d2d729ed4827bf9d6de6a2 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index f8517a5374380c12945aab539fef18cf18893d46..5b70076292597d8c2905e69db2a67a40f73a4124 100644 (file)
@@ -59,7 +59,7 @@ private:
     ItemContainerWidgetsPage *m_tracker;
     int m_value;
 
-    DECLARE_NO_COPY_CLASS(TrackedClientData)
+    wxDECLARE_NO_COPY_CLASS(TrackedClientData);
 };
 
 // ============================================================================
index 3e375d45c956487335f7d84073e9dccdcae265a6..b9135addd55cfd0dbbfa3f7f361e876c058c9122 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index 3cee0cb9b7058948eaf8d5859119e8f1dc0c61f8..fe1ea122e13b3207cf538738b47d3ca5b0e4e99c 100644 (file)
@@ -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;
index de5c452177f2190d507d3c2f31fc96cc4fc3c02c..60b613b8a6433c917294d1d855349496a48c6d77 100644 (file)
@@ -58,7 +58,7 @@ public:
 //// Data
     wxContextHelp* m_contextHelp;
 
-    DECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler);
 };
 
 // ============================================================================
index 8b5b453db056951d39ca9031bfac3e2f2025c909..eab16e5bd89946cc118314745864d80d22231b1f 100644 (file)
@@ -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 */
index f8dcb43e856f1a4155a19d2e8fbda1178e3aea75..3c337d10bbabd0facb3308aab06b8eaa863bd1a5 100644 (file)
@@ -85,7 +85,7 @@ public:
 #endif // wxUSE_DISPLAY
 
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImplSingle)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplSingle);
 };
 
 // ----------------------------------------------------------------------------
index 61bb0e2d0493176158b0a840392323fb2d781277..275134429507ba2d92420f9f6a3996285df9e087 100644 (file)
@@ -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()
index 27e51b8f26cd592e86f469c9a15573ec3ce3f94d..69df300ba2639319b675c1637f91a6edc3d05bba 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index 88f9add4233dbe7c6b0dc8d5c7d623d7b5b3371a..0dee4cb1f1479b75ae4a14c5ae91df0045fc80fc 100644 (file)
@@ -140,7 +140,7 @@ private:
     bool m_flagOld;
     bool& m_flag;
 
-    DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
+    wxDECLARE_NO_COPY_CLASS(ReentrancyBlocker);
 };
 
 // ============================================================================
index 2e9927590d667c48a4173d903575eaa83d387d4d..9cd5628f86cee4063583a3b131a1a8d66b11f36c 100644 (file)
@@ -70,7 +70,7 @@ private:
 #endif // wxUSE_DATETIME
     }
 
-    DECLARE_NO_COPY_CLASS(wxMemoryFSFile)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryFSFile);
 };
 
 #if wxUSE_BASE
index add0e8392abc7515ca1cf90cb37182960d6450d1..e2854eeb6b8840c762c786a331a4bc7379b9193c 100644 (file)
@@ -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)
index fb55baac1b19d930a42fc4cb81dc62f0f68db1f0..1566f40bddff71423b3fbc74a9f67e6735bfec01 100644 (file)
@@ -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)
index da25a7828b236a208c0be98541538d78cdab9846..f6a644fda7bd9cfe766d973f07210753048bec31 100644 (file)
@@ -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)
index d3bf74c5c47c4738a1e1dee452c74c50f5a3fd2f..433e013d05893fe48f8c72a98bd1e7cd90e54ce2 100644 (file)
@@ -88,7 +88,7 @@ public:
     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;
 
-    DECLARE_NO_COPY_CLASS(wxImageRefData)
+    wxDECLARE_NO_COPY_CLASS(wxImageRefData);
 };
 
 wxImageRefData::wxImageRefData()
index 2450ec403360c6d2c595b54a0b63d6e3b0450aeb..0e76cc4aba51024f7794b66ee564dbfb94c48da7 100644 (file)
@@ -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;
 
 // ============================================================================
index 2284a724906607fe5a4163252e7a237bf8c15ff6..657273a324892765b9934455aa83271afe6901f9 100644 (file)
@@ -959,7 +959,7 @@ private:
 
     bool m_bSwapped;   // wrong endianness?
 
-    DECLARE_NO_COPY_CLASS(wxMsgCatalogFile)
+    wxDECLARE_NO_COPY_CLASS(wxMsgCatalogFile);
 };
 
 
index a5dab64013485b071354c2f62ee3ef7841ff878d..6cf153bd38a6715d1176b6a85ac7288793ad1a77 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 1206b78fa0b30584a574c6c06a01ebdd24198954..6cbdbb9d5a10b8132f1309e6f0834d73d4338c04 100644 (file)
@@ -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
index 0aed548807c1c1d39fd73548b459183eb4965679..03712a890a00039766aa0d399d1d8db2adb0b4c7 100644 (file)
@@ -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
index abe4f838102f6a614217316647d15a38845adc3c..9da07423a367d996f44edbb2f8aa68b729553be0 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index 64d31ae75075b8e76301ebc5731d2c8fa9bc269c..c56719561ea0c2979f027749e90931df0d9d3d0c 100644 (file)
@@ -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
index d9242cb93148c33c71de02f32ed5c0f22f3c101f..ee46f5834938a5e12d27257a74b71bff9aeac803 100644 (file)
@@ -3057,7 +3057,7 @@ public:
 private:
     wxWindowBase * const m_win;
 
-    DECLARE_NO_COPY_CLASS(DragAcceptFilesTarget)
+    wxDECLARE_NO_COPY_CLASS(DragAcceptFilesTarget);
 };
 
 
index adca07fc1816c882d4323e9ec235e36ae64b2581..ff7b0310ec387b06bde7bc79a651028880f3b54e 100644 (file)
@@ -59,7 +59,7 @@ private:
     wxSizerItem& m_item;
     const int m_propOld;
 
-    DECLARE_NO_COPY_CLASS(wxPropChanger)
+    wxDECLARE_NO_COPY_CLASS(wxPropChanger);
 };
 
 } // anonymous namespace
index 8461c744228224b38b40d055cabb6853532903e1..a3af2d62468131cf2e826a52ebe2fbdb769b994e 100644 (file)
@@ -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)
index cf767882c5dedf8c96de874f3c24c0f95433897d..723678c0276ff9f739dfb6a304cd792d1c8d2c30 100644 (file)
@@ -31,7 +31,7 @@ public:
     wxInfoFrame(wxWindow *parent, const wxString& message);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxInfoFrame)
+    wxDECLARE_NO_COPY_CLASS(wxInfoFrame);
 };
 
 
index 4e07612000ec81a9da4c62c553a98889cf7948ce..49120ac9395205ee3351b354ad56faed4c0c5805 100644 (file)
@@ -193,7 +193,7 @@ private:
     }
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow)
+    wxDECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow);
 };
 
 BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
index f809ca1cd3a1aec527096270cb62fcc0f4dfba2d..d959d0ea4f379a73456b6b3b85f3baab9efbf6dd 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index 6b29c3a90284998bbd034aba7181f8c505378f03..7380736638342091af7bba2e1d53655fb081f0d0 100644 (file)
@@ -381,7 +381,7 @@ private:
 
     cairo_t* m_context;
 
-    DECLARE_NO_COPY_CLASS(wxCairoContext)
+    wxDECLARE_NO_COPY_CLASS(wxCairoContext);
 };
 
 //-----------------------------------------------------------------------------
index fd023f93b85a4b577692213cec1ebbeb69fea3d4..07fbac049be589bb719235086619192c24fec01c 100644 (file)
@@ -191,7 +191,7 @@ public:
 private:
     const wxHtmlListBox& m_hlbox;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlListBoxStyle);
 };
 
 // ----------------------------------------------------------------------------
index c1d26eac3a3fd7557056743a24ab5e5d35ea795b..0157da1b32a53655567d3666f3362a9cee4dce34 100644 (file)
@@ -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)
index 364cab307ea63640649b2a2cb58b5146fabf6055..f563d7a5b18b5f2f4cd8703e4b98f82d55f465ce 100644 (file)
@@ -81,7 +81,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxNotificationMessageDialog)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessageDialog);
 };
 
 // ============================================================================
index 9691ab4df44e90bf981d4c4ff31380c76d819c5a..ef7dce44374e46475e55c1a2fab7887abc331922 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index 7b3ce8b0b72468cc93d419ed90d0ef99bb8b64ca..feee0ac4b62f9b323bf31ee645c9e7a5e52c6ef3 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index daea96f6696f90d2c8df0bf9a412d3e1b18199e9..8238cd83c411427a1e5e36ad78e91f39784328ad 100644 (file)
@@ -71,7 +71,7 @@ private:
 #endif // !wxUSE_POPUPWIN
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTipWindowView)
+    wxDECLARE_NO_COPY_CLASS(wxTipWindowView);
 };
 
 // ============================================================================
index c143230058fd2718c2b40878ba172f75d96a25c4..d13898a07f4375c47dc60c7516ff7a6180b8c0fb 100644 (file)
@@ -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);
 };
 
 // =============================================================================
index 7192c4e15dd437d0317b68f04b71eec9a11001ef..a4256ef8049dd11511e4645cbaef19a9dd88d03c 100644 (file)
@@ -53,7 +53,7 @@ public:
 private:
     wxVarScrollHelperBase *m_scrollHelper;
 
-    DECLARE_NO_COPY_CLASS(wxVarScrollHelperEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxVarScrollHelperEvtHandler);
 };
 
 // ============================================================================
index 7be26532d951b473a5097d8b79f06de9cbc90424..1094233cd85fc180bbce633556dbbd854d5a55be 100644 (file)
@@ -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
index 96d6da0c0f3a4526642ce46adf5db0b69fe64790..92fb7ecd8a335efd0fd4c72ae16dce3db34f12f4 100644 (file)
@@ -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;
index ff2b953c97ce14b07ddba8b44d25100162b393e4..6a226d4d0b4dab46b15d4a7590db79030e0f0c58 100644 (file)
@@ -52,7 +52,7 @@ public:
     guint16 m_blue;
     wxByte m_alpha;
 
-    DECLARE_NO_COPY_CLASS(wxColourRefData)
+    wxDECLARE_NO_COPY_CLASS(wxColourRefData);
 };
 
 void wxColourRefData::FreeColour()
index 3823149cad67644cdf22591141f4a25194810ae3..923cb6c28e4c46e0d51d8cafeaf0d59b7becebb2 100644 (file)
@@ -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()
index 83aaac88819a70a9558c89d85013c3b5989e7580..506fc99d8fe6b6f0620c94cda83f03f9832552f3 100644 (file)
@@ -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);
 };
 
 
index 78b4719acf7fde873e5a08759a4736293b667eb6..1a079d8f76e8dd1361a9047860a5c8f0aa7920f1 100644 (file)
@@ -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)
index ba8154d00dad9e6ef9524808538304e30149abc8..75c98b514798a941691188f228063b72f93486e3 100644 (file)
@@ -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)
index b93b8f9b6b32d04d85355a77d0ebdc60dc254e0c..56c6f5d7b7f5becfd1a6557b6567461ec4771489 100644 (file)
@@ -71,7 +71,7 @@ private:
     int m_pos,
         m_orient;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlWinAutoScrollTimer);
 };
 
 void wxHtmlWinAutoScrollTimer::Notify()
index fc875b6b8f33f110001d9603802daeae39ef9e3b..c83704ad4cc7a438119b8e380395dca2d6942117 100644 (file)
@@ -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);
 };
 
 
index d2fbb2665220b7ab07a54bfaafd9c19952331021..43904eac7856f20e531add622d95910c9ba2f629 100644 (file)
@@ -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
 
index f1627378b61fbfde5b0b23f8a25bf7c454e1a13c..02d38228cdf25e7bd63cd8b9e36c30d6722bc2b5 100644 (file)
@@ -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
index cfb4d5b32c181e3ee2776cc0a95dd4f754e3d3de..9343b893f5f99b0dd2d849454301f730b8019331 100644 (file)
@@ -51,7 +51,7 @@ public:
         }
     }
 
-    DECLARE_NO_COPY_CLASS(wxHtmlAnchorCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlAnchorCell);
 };
 
 
index 98f1d2b9b10214bc2bf83a52f16505eae15e26d8..a008562b9f2e0c998182b2034d9adde8a345f08a 100644 (file)
@@ -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)
index 8540af13f2510dc346fd61783aa39a397204fcfb..ffca46df3c3a916cd476db2f380cd4bf899c38f8 100644 (file)
@@ -119,7 +119,7 @@ private:
     // only once, before first Layout().
     void ComputeMinMaxWidths();
 
-    DECLARE_NO_COPY_CLASS(wxHtmlTableCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlTableCell);
 };
 
 
index 6cf188e3fd2a462112f611190e5364a87d01185c..dfcb758f2b5663e046224a3bfe48007b8f6a341d 100644 (file)
@@ -54,7 +54,7 @@ protected:
     HACCEL      m_hAccel;
     bool        m_ok;
 
-    DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)
+    wxDECLARE_NO_COPY_CLASS(wxAcceleratorRefData);
 };
 
 // ============================================================================
index 342045001abe0e0c4be0d9ec8e2268f72ccbbeab..5273274406626d2b8fb68d518d9ebcd33f1a615a 100644 (file)
@@ -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()
index 99d72f3e8999f38ccba2706f83a7ea20892ff18f..7cfdff2a5f6ab84e35f490bdb42d31ed2f7f8cf2 100644 (file)
@@ -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)
index f99f3963bf580e9bc8634f5c4384a910c441d174..fcb7e822812745901bb8608f0685b2bf1115da40 100644 (file)
@@ -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
index dd7476f284d91cc090d6bed1f4df37fd0ed4f0fd..66a5a034faabe0f6d0ae6a329d63db60492dd478 100644 (file)
@@ -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
index 1bdeb321f7ba2942e53b855339bc96821acc2af1..08bb1e3f754edeadca6609e2066bc8890234a953 100644 (file)
@@ -132,7 +132,7 @@ private:
 
     int      m_flags;
 
-    DECLARE_NO_COPY_CLASS(wxDirData)
+    wxDECLARE_NO_COPY_CLASS(wxDirData);
 };
 
 // ============================================================================
index aec1509076df9835cd59f73cb018b694fbfd5279..93c673b3eab985a7e55bc286992e61db15d57adb 100644 (file)
@@ -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,
index 280dab0e281bdf5976cff8e0702f20b161285ff8..9b1e7428fbddc36613d44648388422011269ba1c 100644 (file)
@@ -65,7 +65,7 @@ private:
     wxDynamicLibrary m_dll;
 
 
-    DECLARE_NO_COPY_CLASS(wxVersionDLL)
+    wxDECLARE_NO_COPY_CLASS(wxVersionDLL);
 };
 
 // class used to create wxDynamicLibraryDetails objects
index 61441c27820ed96876eb365e5d275bc2d9d97345..8ea315b65744e4fa347d4d2af5f0a6d3315c5aee 100644 (file)
@@ -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;
index fe70af5e6b12332170f2cb8b8c2f9bece62489ca..27c2832868b1e8f8fe44d325ce67b0a88133b56d 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index d3d423b7171454c2ef076653eaea9c1a220d9617..79dc6b1c50bcfd8dae333feddd17b9453e8eeb16 100644 (file)
@@ -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
index 193d30066472d4bf043579e1e4ff7ed37870e5b0..17954f4054169217e877cd8a2e44f1eefc6b9e20 100644 (file)
@@ -1925,7 +1925,7 @@ private:
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 
-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);
 };
 
 
index d86f8723732a7b3a3ca6e1a0012b9dc320698ec0..c73fc1c38dc25a365a635584973ff65fe07f5374 100644 (file)
@@ -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);
 };
 
 //===========================================================================
index ca4d627ac7abc5c96b7294145b9fb5f80c4fe9b4..694386903f6b012470db04f9743b2be0e1002367 100644 (file)
@@ -432,7 +432,7 @@ private:
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 
-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);
 };
 
 
index 8a6f69a29d1b27766520541b7b852c808621df59..24145bbd88e9d472b1619a3d0010c9205895b279 100644 (file)
@@ -700,7 +700,7 @@ public:
 private:
     wxWMP10MediaBackend *m_amb;
 
-    DECLARE_NO_COPY_CLASS(wxWMP10MediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxWMP10MediaEvtHandler);
 };
 #endif
 
index 748445e3ae8f1f810d46df60f3f81cc94fcd6bc2..31a4472be4b195e1151920bc5191ba785a6d6179 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index e2bbed939dd6bdf3d83b4604fbe8b88f035613c6..a2ebcd017f2cfa97599cab96de568c28ccfbd842 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index ff9169dbe59035158d104a6273762b8a4a8ac12a..ba2cb10bc83ef1fff0fff953d1da613aeab14322 100644 (file)
@@ -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);
 };
 
 
index 90f89d419e0412b09bf9659b2f3761c8fcf6f98e..fad7caec377892115e3710652cc102ee4c50cb97 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index 385dd52660acfd86e7377da347f57e7dc84f7176..2e65f600b18ecb0015c3919ff2fe91118854f7e0 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index e09178b7f179e2488849fbe2bbd4e5a02ba9b2af..034a3476e44fb6186522ec9362b17e6c21fd68c4 100644 (file)
@@ -144,7 +144,7 @@ private:
     wxColour      m_colour;
     HPEN          m_hPen;
 
-    DECLARE_NO_ASSIGN_CLASS(wxPenRefData)
+    wxDECLARE_NO_ASSIGN_CLASS(wxPenRefData);
 };
 
 // ============================================================================
index f533f85e0db10195c001112e1fc50e6e14d932a4..3083a5a635d072aa73ca3084b599b839bc2097e3 100644 (file)
@@ -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:
index 93d06259a056ef7ee94e2aabf444ea19e0bdf43d..094ad6c8b8080b41204a226af73030e355bdbd4f 100644 (file)
@@ -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
index 85b76977abfc4baed1d09835d009c829b77dd616..d1e8490ede98a46823448cd565a6646110f2bb72 100644 (file)
@@ -92,7 +92,7 @@ private:
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 
-    DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
+    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl);
 };
 
 // ============================================================================
index 788f3e63d367e12dc416753306fa57987ade423c..1996676888ca4575dcc03ac2c02d3fd9a1ce86f1 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index c75c62b3823206ceff655005caf7961a3907609c..3b9129f0a4bd94cd62abd3b3be5f5a0464ddb5a9 100644 (file)
@@ -169,7 +169,7 @@ public:
 private:
     int& m_count;
 
-    DECLARE_NO_COPY_CLASS(UpdatesCountFilter)
+    wxDECLARE_NO_COPY_CLASS(UpdatesCountFilter);
 };
 
 // ----------------------------------------------------------------------------
index f8b91e383cd78c7f5deb7f32e05fcc2b87ca1dd5..7a30e5daf8d80c8d090937e899ac1470ae0bd6ff 100644 (file)
@@ -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)
index 2a692e374d939aca6e8ba5240e543d88baad1583..29dcb255d9bbddd03363a221e1951ce61f24bc53 100644 (file)
@@ -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
index 5dcbef4abe6184f562bf2d5e7713c405c7299e63..724dc006bc2a70faebd5237ea019ced11603d8ec 100644 (file)
@@ -214,7 +214,7 @@ private:
     size_t m_nSepCount;
     wxStaticText *m_staticText;
 
-    DECLARE_NO_COPY_CLASS(wxToolBarTool)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarTool);
 };
 
 // ----------------------------------------------------------------------------
index adde05b475d3e06b9d8780b7b6264945e71b4173..270f2a6fc5b22b44a6e9e618ecef055e9aec2d78 100644 (file)
@@ -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);
 };
 
 // ----------------------------------------------------------------------------
index 94ae0483f5502e310692ebc635dffdd64dbb6f97..d081fc1956e3cab25ec0b77d68112f1fddfcaab2 100644 (file)
@@ -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
index 9aa21972903c8e7540d0bf4db3958a4704e0a6d7..97dd87449389d1e3da696c284777ca23577fe99b 100644 (file)
@@ -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
index f67e0eb11d9cf3024b5b7e6f2c9f2f5c1b200dd1..0269180d9a9b5910e5ca935dbff337f6933e6954 100644 (file)
@@ -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
index e0af18abc5579bc37534eb06f785beea6ed3b9dd..fbc5e3da215605432b3e089d5694753a9930479e 100644 (file)
@@ -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)
index 6ccf144ddb437a93eac0d620e09075cf05081ece..edd074f652817b923376b77920d8828c05876779 100644 (file)
@@ -182,7 +182,7 @@ private:
                  );
 
     const wxTreeCtrl*               m_pTree;
-    DECLARE_NO_COPY_CLASS(wxTreeTraversal)
+    wxDECLARE_NO_COPY_CLASS(wxTreeTraversal);
 }; // end of CLASS wxTreeTraversal
 
 //
index 751ea2b6f7558dc6bb50d105aaeb8966c31f4c32..0086d4ade150e58177fe363a80e0061eca02ae9f 100644 (file)
@@ -66,7 +66,7 @@ protected:
 
     friend class wxCursor;
 
-    DECLARE_NO_ASSIGN_CLASS(wxCursorRefData)
+    wxDECLARE_NO_ASSIGN_CLASS(wxCursorRefData);
 };
 
 #define M_CURSORDATA static_cast<wxCursorRefData*>(m_refData)
index 40deec3d811b76639537ff1347cc171fa3924a62..662469dfefe9c1ca5003d01f69534a6b72de3de2 100644 (file)
@@ -181,7 +181,7 @@ public:
 private:
     wxQTMediaBackend *m_qtb;
 
-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);
 };
 
 //===========================================================================
index cd479a6f2d8320776fe22e394a73a303a6798918..58dc33c1a6bb9d25cdd457292853c9b94c277b61 100644 (file)
@@ -41,7 +41,7 @@ public:
     wxTaskBarIcon *m_parent;
     class wxTaskBarIconWindow *m_menuEventWindow;
 
-    DECLARE_NO_COPY_CLASS(wxTaskBarIconImpl)
+    wxDECLARE_NO_COPY_CLASS(wxTaskBarIconImpl);
 };
 
 //-----------------------------------------------------------------------------
index ee9dd86becd748071da269812aa249c2d9f99c0e..1949980f8f3a5c64a0cf5e85b337602e7119f7cf 100644 (file)
@@ -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 );
index f780d4bc03a3968331c78dd6254e62731041b0d9..0aa6d3939ccd18c3307ab91c4c7fbd77656e073c 100644 (file)
@@ -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 )
index b6d327b863f991d1e14d5e71fc240b1bcbd7b354..6c6b76027440729df8f39d9a280eb7728c1753aa 100644 (file)
@@ -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;
index 45dcdd802f1c46a8bc3fcb7d2e27064b39fc999f..4598f001e9213dbf110abafa09b05551a8f48ebd 100644 (file)
@@ -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);
 };
 
 // ============================================================================
index 07ae1a7f47a9f7893e0f14a89c3214a41917b7a6..917b821ce1e233b3de9150f53989e8aa77ae88e2 100644 (file)
@@ -156,7 +156,7 @@ private:
     CFSocketRef m_socket;
     CFRunLoopSourceRef m_source;
 
-    DECLARE_NO_COPY_CLASS(wxSocketImplMac)
+    wxDECLARE_NO_COPY_CLASS(wxSocketImplMac);
 };
 
 } // anonymous namespace
index 3c1a22c533bae4ac3241922cb0a85477ad2d6844..a288caa9bde0e8318fed394af92900842f4b94c0 100644 (file)
@@ -37,7 +37,7 @@ protected:
 
     friend class WXDLLIMPEXP_FWD_CORE wxPalette;
 
-    DECLARE_NO_ASSIGN_CLASS(wxPaletteRefData)
+    wxDECLARE_NO_ASSIGN_CLASS(wxPaletteRefData);
 };
 
 wxPaletteRefData::wxPaletteRefData()
index e6f57eac06360fb302536c9ff65badefbc968aee..0171a66b974710d117dc54ae7fa6fc3a135f1a57 100644 (file)
@@ -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)
index 5c229280597eb3eb4cc1d8b273ec5ccb5cabc2a5..35e484a48a77013bb9cc2fda3e8c323930634b54 100644 (file)
@@ -92,7 +92,7 @@ public:
 private:
     wxMask       *m_bitmapMask;
 
-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapRefData);
 };
 
 // ----------------------------------------------------------------------------
index 358a423dc641fe32401797607e97b6eeae9f5d31..a7757f3630afdfa44d4f9b3db663333493c5243b 100644 (file)
@@ -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;
index 86b31851f5f81fb5c508e5246527748eaab318a3..1dff7815d09fb87c297fa55dc1d01dd6135a5d13 100644 (file)
@@ -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;
index a4a0ff8d25822614736e3de45ceb245741e44be7..f795c8289b75585a82f1fdd905226d62476e05ca 100644 (file)
@@ -68,7 +68,7 @@ private:
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 
-    DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
+    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl);
 };
 
 // ============================================================================
index 6dbe22bb95808bf0651f5759e1d7d370b5487ac7..765a778535dc5f7c9d63546bf214e7d7bf55cecf 100644 (file)
@@ -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
index 886cdcbb70d0c7286c614ca45ab462ea439fa32c..166d36c8331c9b987cac3caa502a1b19374762db 100644 (file)
@@ -129,7 +129,7 @@ public:
 private:
     size_t m_nSepCount;
 
-    DECLARE_NO_COPY_CLASS(wxToolBarTool)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarTool);
 };
 
 
index 23d28857a6b86545a9d5c47f061264859ca1ea26..0aafee0a544be3e7ef84f1eb28896ba6311eb8c3 100644 (file)
@@ -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
index 62669bcf2d36235c1c0db6fd777c3e5d190e088e..d65700afa6dc9768814e1dac028758622c874604 100644 (file)
@@ -67,7 +67,7 @@ public:
 private:
     FILE *m_fp;
 
-    DECLARE_NO_COPY_CLASS(wxStdioPipe)
+    wxDECLARE_NO_COPY_CLASS(wxStdioPipe);
 };
 
 // ============================================================================
index d7036f000b5dcd08d0d94031cf7ee786bfb2dd25..f4918245fb75cd7b42c86189b52da272069acaeb 100644 (file)
@@ -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