use DECLARE_NO_COPY_CLASS() where applicable (patch 633384)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/buffer.h

@@ -172,6 +172,8 @@ private:
 
     // the reference count
     size_t m_ref;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryBufferData)
 };
 
 

include/wx/busyinfo.h

@@ -46,6 +46,8 @@ public:
 
 private:
     wxInfoFrame *m_InfoFrame;
+
+    DECLARE_NO_COPY_CLASS(wxBusyInfo)
 };
 
 

include/wx/caret.h

@@ -224,6 +224,8 @@ public:
 
 private:
     wxCaret *m_caret;
+
+    DECLARE_NO_COPY_CLASS(wxCaretSuspend)
 };
 
 #endif // wxUSE_CARET

include/wx/clipbrd.h

@@ -135,6 +135,8 @@ public:
 
 private:
     wxClipboard *m_clipboard;
+
+    DECLARE_NO_COPY_CLASS(wxClipboardLocker)
 };
 
 #endif // wxUSE_CLIPBOARD

include/wx/cmdline.h

@@ -209,6 +209,8 @@ private:
     void Init();
 
     struct wxCmdLineParserData *m_data;
+
+    DECLARE_NO_COPY_CLASS(wxCmdLineParser)
 };
 
 #else // !wxUSE_CMDLINE_PARSER

include/wx/cmdproc.h

@@ -123,6 +123,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
+    DECLARE_NO_COPY_CLASS(wxCommandProcessor)
 };
 
 #endif // _WX_CMDPROC_H_

include/wx/confbase.h

@@ -307,6 +307,8 @@ private:
   wxString      m_strName,      // name of entry (i.e. name only)
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
+
+    DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
 };
 
 

include/wx/cshelp.h

@@ -174,6 +174,8 @@ public:
 
 protected:
     wxHelpControllerBase*   m_helpController;
+
+    DECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider)
 };
 
 // Convenience function for turning context id into wxString

include/wx/dataobj.h

@@ -447,6 +447,8 @@ private:
         { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }
     bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
         { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }
+
+    DECLARE_NO_COPY_CLASS(wxCustomDataObject)
 };
 
 // ----------------------------------------------------------------------------

include/wx/datstrm.h

@@ -60,6 +60,8 @@ protected:
 #if wxUSE_UNICODE
     wxMBConv& m_conv;
 #endif
+
+    DECLARE_NO_COPY_CLASS(wxDataInputStream)
 };
 
 class WXDLLEXPORT wxDataOutputStream
@@ -101,6 +103,8 @@ protected:
 #if wxUSE_UNICODE
     wxMBConv& m_conv;
 #endif
+
+    DECLARE_NO_COPY_CLASS(wxDataOutputStream)
 };
 
 #endif

include/wx/dcbuffer.h

@@ -72,6 +72,8 @@ public:
         // to) is destroyed.
 
     void UnMask();
+
+    DECLARE_NO_COPY_CLASS(wxBufferedDC)
 };
 
 

include/wx/dir.h

@@ -132,6 +132,8 @@ private:
     friend class WXDLLEXPORT wxDirData;
 
     wxDirData *m_data;
+
+    DECLARE_NO_COPY_CLASS(wxDir)
 };
 
 #endif // _WX_DIR_H_

include/wx/dnd.h

@@ -119,6 +119,8 @@ protected:
     wxCursor m_cursorCopy,
              m_cursorMove,
              m_cursorStop;
+
+    DECLARE_NO_COPY_CLASS(wxDropSourceBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -192,6 +194,8 @@ public:
 
 protected:
     wxDataObject *m_dataObject;
+
+    DECLARE_NO_COPY_CLASS(wxDropTargetBase)
 };
 
 // ----------------------------------------------------------------------------

include/wx/docmdi.h

@@ -49,6 +49,7 @@ protected:
 private:
     DECLARE_CLASS(wxDocMDIParentFrame)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDocMDIParentFrame)
 };
 
 /*
@@ -82,6 +83,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDocMDIChildFrame)
+    DECLARE_NO_COPY_CLASS(wxDocMDIChildFrame)
 };
 
 #endif

include/wx/docview.h

@@ -161,6 +161,7 @@ protected:
     
 private:
     DECLARE_ABSTRACT_CLASS(wxDocument)
+    DECLARE_NO_COPY_CLASS(wxDocument)
 };
 
 class WXDLLEXPORT wxView: public wxEvtHandler
@@ -221,9 +222,10 @@ protected:
     wxDocument*       m_viewDocument;
     wxString          m_viewTypeName;
     wxWindow*         m_viewFrame;
-    
+
 private:
     DECLARE_ABSTRACT_CLASS(wxView)
+    DECLARE_NO_COPY_CLASS(wxView)
 };
 
 // Represents user interface (and other) properties of documents and views
@@ -290,6 +292,7 @@ protected:
     
 private:
     DECLARE_CLASS(wxDocTemplate)
+    DECLARE_NO_COPY_CLASS(wxDocTemplate)
 };
 
 // One object of this class may be created in an application, to manage all
@@ -420,6 +423,7 @@ protected:
     static wxDocManager* sm_docManager;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 
 // ----------------------------------------------------------------------------
@@ -459,6 +463,7 @@ protected:
 private:
     DECLARE_CLASS(wxDocChildFrame)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDocChildFrame)
 };
 
 // ----------------------------------------------------------------------------
@@ -492,6 +497,7 @@ protected:
 private:
     DECLARE_CLASS(wxDocParentFrame)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDocParentFrame)
 };
 
 // ----------------------------------------------------------------------------
@@ -515,6 +521,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDocPrintout)
+    DECLARE_NO_COPY_CLASS(wxDocPrintout)
 };
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
@@ -566,6 +573,7 @@ protected:
     
 private:
     DECLARE_DYNAMIC_CLASS(wxFileHistory)
+    DECLARE_NO_COPY_CLASS(wxFileHistory)
 };
 
 #if wxUSE_STD_IOSTREAM

include/wx/encconv.h

@@ -148,6 +148,7 @@ class WXDLLEXPORT wxEncodingConverter : public wxObject
             bool m_UnicodeInput, m_UnicodeOutput;
             bool m_JustCopy;
 
+    DECLARE_NO_COPY_CLASS(wxEncodingConverter)
 };
 
 #endif // wxUSE_FONTMAP

include/wx/evtloop.h

@@ -55,6 +55,8 @@ protected:
     class WXDLLEXPORT wxEventLoopImpl *m_impl;
     // the pointer to currently active loop
     static wxEventLoop *ms_activeLoop;
+
+    DECLARE_NO_COPY_CLASS(wxEventLoop)
 };
 
 #endif // _WX_EVTLOOP_H_

include/wx/fdrepdlg.h

@@ -124,6 +124,8 @@ protected:
 
     // the last string we searched for
     wxString m_lastSearch;
+
+    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase)
 };
 
 // include wxFindReplaceDialog declaration

include/wx/fileconf.h

@@ -210,6 +210,8 @@ private:
 #ifdef __UNIX__
   int m_umask;                    // the umask to use for file creation
 #endif // __UNIX__
+
+    DECLARE_NO_COPY_CLASS(wxFileConfig)
 };
 
 #endif

include/wx/filesys.h

@@ -79,6 +79,7 @@ private:
     wxDateTime m_Modif;
 
     DECLARE_ABSTRACT_CLASS(wxFSFile)
+    DECLARE_NO_COPY_CLASS(wxFSFile)
 };
 
 
@@ -202,6 +203,7 @@ protected:
             // handler that succeed in FindFirst query
 
     DECLARE_DYNAMIC_CLASS(wxFileSystem)
+    DECLARE_NO_COPY_CLASS(wxFileSystem)
 };
 
 

include/wx/fontenum.h

@@ -84,6 +84,8 @@ public:
     
 private:
     wxArrayString *m_Facenames, *m_Encodings;
+
+    DECLARE_NO_COPY_CLASS(wxFontEnumerator)
 };
 
 #endif // _WX_FONTENUM_H_

include/wx/fontmap.h

@@ -188,6 +188,8 @@ protected:
     
 private:
     static wxFontMapper *sm_instance;
+
+    DECLARE_NO_COPY_CLASS(wxFontMapper)
 };
 
 // ----------------------------------------------------------------------------

include/wx/frame.h

@@ -220,6 +220,7 @@ protected:
 #endif // wxUSE_TOOLBAR
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxFrameBase)
 };
 
 // include the real class declaration

include/wx/fs_zip.h

@@ -48,6 +48,8 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
         wxHashTableLong *m_DirsFound;
 
         wxString DoFind();
+
+    DECLARE_NO_COPY_CLASS(wxZipFSHandler)
 };
 
 

include/wx/generic/calctrl.h

@@ -298,6 +298,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxCalendarCtrl)
 };
 
 #endif // _WX_GENERIC_CALCTRL_H

include/wx/generic/choicdgg.h

@@ -61,6 +61,8 @@ public:
 
 protected:
     wxListBox  *m_listbox;
+
+    DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
 };
 
 // ----------------------------------------------------------------------------

include/wx/generic/dirctrlg.h

@@ -184,6 +184,7 @@ private:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)
+    DECLARE_NO_COPY_CLASS(wxGenericDirCtrl)
 };
 
 //-----------------------------------------------------------------------------
@@ -223,6 +224,7 @@ protected:
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDirFilterListCtrl)
+    DECLARE_NO_COPY_CLASS(wxDirFilterListCtrl)
 };
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)

include/wx/generic/dragimgg.h

@@ -288,6 +288,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDragImage)
+    DECLARE_NO_COPY_CLASS(wxGenericDragImage)
 };
 
 #endif

include/wx/generic/grid.h

@@ -384,6 +384,8 @@ protected:
     // suppress the stupid gcc warning about the class having private dtor and
     // no friends
     friend class wxGridCellEditorDummyFriend;
+
+    DECLARE_NO_COPY_CLASS(wxGridCellEditor)
 };
 
 #if wxUSE_TEXTCTRL
@@ -768,6 +770,8 @@ private:
     void InitData();
 
     wxGridCellAttrProviderData *m_data;
+
+    DECLARE_NO_COPY_CLASS(wxGridCellAttrProvider)
 };
 
 //////////////////////////////////////////////////////////////////////
@@ -856,6 +860,7 @@ private:
     wxGridCellAttrProvider *m_attrProvider;
 
     DECLARE_ABSTRACT_CLASS( wxGridTableBase );
+    DECLARE_NO_COPY_CLASS(wxGridTableBase)
 };
 
 
@@ -899,6 +904,8 @@ private:
     int m_id;
     int m_comInt1;
     int m_comInt2;
+
+    DECLARE_NO_COPY_CLASS(wxGridTableMessage)
 };
 
 
@@ -1853,6 +1860,7 @@ protected:
 
     DECLARE_DYNAMIC_CLASS( wxGrid )
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxGrid)
 };
 
 // ----------------------------------------------------------------------------
@@ -2001,6 +2009,7 @@ private:
     wxControl* m_ctrl;
 
     DECLARE_DYNAMIC_CLASS(wxGridEditorCreatedEvent)
+    DECLARE_NO_COPY_CLASS(wxGridEditorCreatedEvent)
 };
 
 

include/wx/generic/gridsel.h

@@ -83,6 +83,8 @@ private:
     wxGrid::wxGridSelectionModes        m_selectionMode;
 
     friend class WXDLLEXPORT wxGrid;
+
+    DECLARE_NO_COPY_CLASS(wxGridSelection)
 };
 
 #endif  // #ifdef __WXGRIDSEL_H__

include/wx/generic/progdlgg.h

@@ -124,6 +124,8 @@ private:
 private:
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }
+
+    DECLARE_NO_COPY_CLASS(wxProgressDialog)
 };
 #endif
 

include/wx/generic/sashwin.h

@@ -193,6 +193,7 @@ private:
 private:
     DECLARE_DYNAMIC_CLASS(wxSashWindow)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSashWindow)
 };
 
 BEGIN_DECLARE_EVENT_TYPES()

include/wx/generic/splash.h

@@ -67,6 +67,7 @@ protected:
 
 DECLARE_DYNAMIC_CLASS(wxSplashScreen)
 DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSplashScreen)
 };
 
 /*

include/wx/generic/splitter.h

@@ -285,6 +285,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSplitterWindow)
 };
 
 // ----------------------------------------------------------------------------

include/wx/generic/textdlgg.h

@@ -66,6 +66,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
+    DECLARE_NO_COPY_CLASS(wxTextEntryDialog)
 };
 
 // ----------------------------------------------------------------------------

include/wx/generic/treectlg.h

@@ -467,6 +467,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
+    DECLARE_NO_COPY_CLASS(wxGenericTreeCtrl)
 };
 
 #if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)

include/wx/generic/treelay.h

@@ -140,6 +140,7 @@ private:
     
 private:
     DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)
+    DECLARE_NO_COPY_CLASS(wxTreeLayoutStored)
 };
 
 // For backward compatibility

include/wx/generic/wizard.h

@@ -97,5 +97,6 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxWizard)
 };
 

include/wx/gifdecod.h

@@ -78,6 +78,8 @@ public:
     unsigned char *pal;             /* palette */
     GIFImage *next;                 /* next image */
     GIFImage *prev;                 /* prev image */
+
+    DECLARE_NO_COPY_CLASS(GIFImage)
 };
 
 
@@ -148,6 +150,8 @@ public:
 
     // convert current frame to wxImage
     bool ConvertToImage(wxImage *image) const;
+
+    DECLARE_NO_COPY_CLASS(wxGIFDecoder)
 };
 
 

include/wx/hashmap.h

@@ -24,6 +24,10 @@ struct WXDLLEXPORT _wxHashTable_NodeBase
     _wxHashTable_NodeBase() : m_nxt(0) {}
 
     _wxHashTable_NodeBase* m_nxt;
+
+// Cannot do this:
+//  DECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase)
+// without rewriting the macros, which require a public copy constructor.
 };
 
 // private

include/wx/html/helpctrl.h

@@ -99,6 +99,8 @@ protected:
     wxString            m_titleFormat;
     int                 m_FrameStyle;
     // DECLARE_EVENT_TABLE()
+
+    DECLARE_NO_COPY_CLASS(wxHtmlHelpController)
 };
 
 #endif // wxUSE_WXHTML_HELP

include/wx/html/helpdata.h

@@ -115,6 +115,8 @@ private:
     wxChar *m_Keyword;
     bool m_CaseSensitive;
     bool m_WholeWords;
+
+    DECLARE_NO_COPY_CLASS(wxSearchEngine)
 };
 
 
@@ -147,6 +149,8 @@ private:
     int m_CurIndex;  // where we are now
     int m_MaxIndex;  // number of files we search
     // For progress bar: 100*curindex/maxindex = % complete
+
+    DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus)
 };
 
 class WXDLLEXPORT wxHtmlHelpData : public wxObject
@@ -205,6 +209,8 @@ protected:
     bool LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f);
     // Writes binary book
     bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
+
+    DECLARE_NO_COPY_CLASS(wxHtmlHelpData)
 };
 
 #endif

include/wx/html/helpfrm.h

@@ -226,6 +226,7 @@ protected:
     int m_hfStyle;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame)
 };
 
 #endif // wxUSE_WXHTML_HELP

include/wx/html/htmlcell.h

@@ -146,6 +146,8 @@ protected:
             // true if this cell can be placed on pagebreak, false otherwise
     wxString m_id;
             // unique identifier of the cell, generated from "id" property of tags
+
+    DECLARE_NO_COPY_CLASS(wxHtmlCell)
 };
 
 
@@ -259,6 +261,8 @@ protected:
     int m_LastLayout;
             // if != -1 then call to Layout may be no-op
             // if previous call to Layout has same argument
+
+    DECLARE_NO_COPY_CLASS(wxHtmlContainerCell)
 };
 
 
@@ -330,6 +334,8 @@ protected:
     wxWindow* m_Wnd;
     int m_WidthFloat;
             // width float is used in adjustWidth (it is in percents)
+
+    DECLARE_NO_COPY_CLASS(wxHtmlWidgetCell)
 };
 
 

include/wx/html/htmlpars.h

@@ -174,6 +174,8 @@ protected:
     wxList m_HandlersList;
     wxHashTable m_HandlersHash;
 
+    DECLARE_NO_COPY_CLASS(wxHtmlParser)
+
     // class for opening files (file system)
     wxFileSystem *m_FS;
     // handlers stack used by PushTagHandler and PopTagHandler
@@ -228,6 +230,8 @@ protected:
         { m_Parser->DoParsing(tag.GetBeginPos(), tag.GetEndPos1()); }
 
     wxHtmlParser *m_Parser;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlTagHandler)
 };
 
 
@@ -264,6 +268,8 @@ protected:
     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif
+
+    DECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser)
 };
 
 

include/wx/html/htmltag.h

@@ -47,6 +47,8 @@ public:
 
     // Finds parameters for tag starting at at and fills the variables
     void QueryTag(int at, int* end1, int* end2);
+
+    DECLARE_NO_COPY_CLASS(wxHtmlTagsCache)
 };
 
 
@@ -142,6 +144,8 @@ private:
     wxHtmlTag *m_Prev;
     wxHtmlTag *m_FirstChild, *m_LastChild;
     wxHtmlTag *m_Parent;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlTag)
 };
 
 

include/wx/html/htmlwin.h

@@ -269,6 +269,7 @@ private:
     static wxHtmlProcessorList *m_GlobalProcessors;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxHtmlWindow)
 };
 
 

include/wx/html/htmprint.h

@@ -74,6 +74,8 @@ private:
     wxFileSystem *m_FS;
     wxHtmlContainerCell *m_Cells;
     int m_MaxWidth, m_Width, m_Height;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlDCRenderer)
 };
 
 
@@ -155,6 +157,8 @@ private:
     int m_HeaderHeight, m_FooterHeight;
     wxHtmlDCRenderer *m_Renderer, *m_RendererHdr;
     float m_MarginTop, m_MarginBottom, m_MarginLeft, m_MarginRight, m_MarginSpace;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlPrintout)
 };
 
 
@@ -219,6 +223,8 @@ private:
     wxString m_Name;
     wxString m_Headers[2], m_Footers[2];
     wxFrame *m_Frame;
+
+    DECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting)
 };
 
 

include/wx/html/winpars.h

@@ -176,6 +176,8 @@ private:
     wxString m_FontFaceFixed, m_FontFaceNormal;
             // html font sizes and faces of fixed and proportional fonts
 
+    DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
+
 #if !wxUSE_UNICODE
     wxFontEncoding m_InputEnc, m_OutputEnc;
             // I/O font encodings
@@ -206,6 +208,8 @@ public:
 
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
+
+    DECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler)
 };
 
 

include/wx/intl.h

@@ -502,6 +502,8 @@ private:
     bool           m_bConvertEncoding;
 
     static wxLanguageInfoArray *ms_languagesDB;
+
+    DECLARE_NO_COPY_CLASS(wxLocale)
 };
 
 // ----------------------------------------------------------------------------

include/wx/ipcbase.h

@@ -122,6 +122,8 @@ private:
   wxChar *      m_buffer;
   size_t        m_buffersize;
   bool          m_deletebufferwhendone;
+
+    DECLARE_NO_COPY_CLASS(wxConnectionBase)
 };
 
 

include/wx/layout.h

@@ -148,6 +148,8 @@ public:
     // Get the value of this edge or dimension, or if this
     // is not determinable, -1.
     int GetEdge(wxEdge which, wxWindowBase *thisWin, wxWindowBase *other) const;
+
+    DECLARE_NO_COPY_CLASS(wxIndividualLayoutConstraint)
 };
 
 // ----------------------------------------------------------------------------

include/wx/log.h

@@ -369,6 +369,8 @@ private:
 
     // do we pass the messages to the old logger?
     bool m_bPassMessages;
+
+    DECLARE_NO_COPY_CLASS(wxLogChain)
 };
 
 // a chain log target which uses itself as the new logger
@@ -400,6 +402,8 @@ private:
 
     // the control we use
     wxTextCtrl *m_pTextCtrl;
+
+    DECLARE_NO_COPY_CLASS(wxLogTextCtrl)
 };
 
 #endif // wxUSE_TEXTCTRL
@@ -478,6 +482,8 @@ protected:
 
 private:
     wxLogFrame *m_pLogFrame;      // the log frame
+
+    DECLARE_NO_COPY_CLASS(wxLogWindow)
 };
 
 #endif // wxUSE_LOGWINDOW

include/wx/menu.h

@@ -389,6 +389,8 @@ protected:
     long           m_style;             // combination of wxMENU_XXX flags
 
     wxEvtHandler  *m_eventHandler;      // a pluggable in event handler
+
+    DECLARE_NO_COPY_CLASS(wxMenuBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -516,6 +518,8 @@ protected:
 
     // the frame we are attached to (may be NULL)
     wxFrame *m_menuBarFrame;
+
+    DECLARE_NO_COPY_CLASS(wxMenuBarBase)
 };
 
 // ----------------------------------------------------------------------------

include/wx/mstream.h

@@ -40,6 +40,8 @@ protected:
 
 private:
     size_t m_length;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryInputStream)
 };
 
 class WXDLLEXPORT wxMemoryOutputStream : public wxOutputStream
@@ -64,6 +66,8 @@ protected:
     size_t OnSysWrite(const void *buffer, size_t nbytes);
     off_t OnSysSeek(off_t pos, wxSeekMode mode);
     off_t OnSysTell() const;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 
 #endif

include/wx/msw/bitmap.h

@@ -64,6 +64,8 @@ public:
     // optional mask for transparent drawing
     wxMask       *m_bitmapMask;
 
+    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+
 #if wxUSE_DIB_FOR_BITMAP
     WXHANDLE     m_hFileMap;	// file mapping handle for large DIB's
 #endif

include/wx/msw/dc.h

@@ -241,6 +241,7 @@ protected:
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxDC)
+    DECLARE_NO_COPY_CLASS(wxDC)
 };
 
 // ----------------------------------------------------------------------------

include/wx/msw/dde.h

@@ -78,6 +78,8 @@ public:
   wxChar*       m_sendingData;
   int           m_dataSize;
   wxIPCFormat  m_dataType;
+
+    DECLARE_NO_COPY_CLASS(wxDDEConnection)
 };
 
 class WXDLLEXPORT wxDDEServer: public wxServerBase

include/wx/msw/dialog.h

@@ -121,6 +121,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDialog)
 };
 
 #endif

include/wx/msw/dragimag.h

@@ -260,6 +260,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
+    DECLARE_NO_COPY_CLASS(wxDragImage)
 };
 
 #endif

include/wx/msw/fdrepdlg.h

@@ -57,6 +57,7 @@ protected:
     wxFindReplaceDialogImpl *m_impl;
 
     DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
+    DECLARE_NO_COPY_CLASS(wxFindReplaceDialog)
 };
 
 

include/wx/msw/filedlg.h

@@ -69,6 +69,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    DECLARE_NO_COPY_CLASS(wxFileDialog)
 };
 
 // File selector - backward compatibility

include/wx/msw/helpbest.h

@@ -110,6 +110,7 @@ protected:
     wxHelpControllerBase* m_helpController;
 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)
+    DECLARE_NO_COPY_CLASS(wxBestHelpController)
 };
 
 #endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP

include/wx/msw/listctrl.h

@@ -397,6 +397,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxListCtrl)
 };
 
 #endif // wxUSE_LISTCTRL

include/wx/msw/mdi.h

@@ -114,6 +114,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
 };
 
 // ---------------------------------------------------------------------------

include/wx/msw/msgdlg.h

@@ -38,6 +38,8 @@ public:
         long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal(void);
+
+    DECLARE_NO_COPY_CLASS(wxMessageDialog)
 };
 
 

include/wx/msw/ole/automtn.h

@@ -92,6 +92,8 @@ public:
 
 public:
     WXIDISPATCH*  m_dispatchPtr;
+
+    DECLARE_NO_COPY_CLASS(wxAutomationObject)
 };
 
 

include/wx/msw/ole/dataobj.h

@@ -58,6 +58,8 @@ public:
     virtual size_t GetBufferOffset( const wxDataFormat& format );
 private:
     IDataObject *m_pIDataObject; // pointer to the COM interface
+
+    DECLARE_NO_COPY_CLASS(wxDataObject)
 };
 
 #endif  //_WX_MSW_OLE_DATAOBJ_H

include/wx/msw/ole/dataobj2.h

@@ -41,6 +41,8 @@ public:
 private:
     // the DIB data
     void /* BITMAPINFO */ *m_data;
+
+    DECLARE_NO_COPY_CLASS(wxBitmapDataObject)
 };
 
 // ----------------------------------------------------------------------------
@@ -101,6 +103,8 @@ public:
 private:
     // last data object we got data in
     wxDataObjectSimple *m_dataObjectLast;
+
+    DECLARE_NO_COPY_CLASS(wxURLDataObject)
 };
 
 #endif // _WX_MSW_OLE_DATAOBJ2_H

include/wx/msw/ole/dropsrc.h

@@ -76,6 +76,8 @@ protected:
 
 private:
     wxIDropSource *m_pIDropSource;  // the pointer to COM interface
+
+    DECLARE_NO_COPY_CLASS(wxDropSource)
 };
 
 #endif  //_WX_OLEDROPSRC_H

include/wx/msw/ole/droptgt.h

@@ -69,6 +69,8 @@ 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)
 };
 
 #endif  //_WX_OLEDROPTGT_H

include/wx/msw/pen.h

@@ -41,6 +41,14 @@ protected:
   wxDash *      m_dash ;
   wxColour      m_colour;
   WXHPEN        m_hPen;
+
+private:
+// Cannot use
+//  DECLARE_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:
+    wxPenRefData& operator=(const wxPenRefData&);
 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)

include/wx/msw/printdlg.h

@@ -49,6 +49,8 @@ private:
     wxDC*             m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
+
+    DECLARE_NO_COPY_CLASS(wxPrintDialog)
 };
 
 class WXDLLEXPORT wxPageSetupDialog: public wxDialog
@@ -68,6 +70,8 @@ public:
 private:
     wxPageSetupData   m_pageSetupData;
     wxWindow*         m_dialogParent;
+
+    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE

include/wx/msw/printwin.h

@@ -38,6 +38,8 @@ public:
 
 private:
     WXFARPROC     m_lpAbortProc;
+
+    DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
 };
 
 // ---------------------------------------------------------------------------

include/wx/msw/private.h

@@ -346,6 +346,8 @@ public:
 
 private:
     HDC m_hdc;
+
+    DECLARE_NO_COPY_CLASS(ScreenHDC)
 };
 
 // the same as ScreenHDC but for memory DCs: creates the HDC in ctor and
@@ -360,6 +362,8 @@ public:
 
 private:
     HDC m_hdc;
+
+    DECLARE_NO_COPY_CLASS(MemoryHDC)
 };
 
 // a class which selects a GDI object into a DC in its ctor and deselects in
@@ -378,6 +382,8 @@ public:
 private:
    HDC m_hdc;
    HGDIOBJ m_hgdiobj;
+
+    DECLARE_NO_COPY_CLASS(SelectInHDC)
 };
 
 // ---------------------------------------------------------------------------

include/wx/msw/radiobox.h

@@ -134,6 +134,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    DECLARE_NO_COPY_CLASS(wxRadioBox)
 };
 
 #endif

include/wx/msw/spinctrl.h

@@ -112,6 +112,7 @@ protected:
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSpinCtrl)
 };
 
 #endif // _WX_MSW_SPINCTRL_H_

include/wx/msw/statbmp.h

@@ -99,6 +99,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
 };
 
 #endif

include/wx/msw/tabctrl.h

@@ -124,6 +124,7 @@ protected:
     wxImageList*    m_imageList;
 
 DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxTabCtrl)
 };
 
 class WXDLLEXPORT wxTabEvent : public wxNotifyEvent

include/wx/msw/tbar95.h

@@ -127,6 +127,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
+    DECLARE_NO_COPY_CLASS(wxToolBar)
 };
 
 #endif // wxUSE_TOOLBAR

include/wx/msw/tooltip.h

@@ -55,5 +55,6 @@ private:
     wxWindow *m_window;         // window we're associated with
 
     DECLARE_ABSTRACT_CLASS(wxToolTip)
+    DECLARE_NO_COPY_CLASS(wxToolTip)
 };
 

include/wx/msw/toplevel.h

@@ -120,6 +120,7 @@ protected:
     wxWindow             *m_winLastFocused;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
 };
 
 // list of all frames and modeless dialogs

include/wx/msw/treectrl.h

@@ -478,6 +478,7 @@ private:
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
 };
 
 #endif // wxUSE_TREECTRL

include/wx/msw/wave.h

@@ -44,6 +44,8 @@ private:
   wxByte* m_waveData;
   int   m_waveLength;
   bool  m_isResource;
+
+    DECLARE_NO_COPY_CLASS(wxWave)
 };
 #endif
 #endif

include/wx/notebook.h

@@ -165,6 +165,8 @@ protected:
     wxArrayPages  m_pages;      // array of pages
     wxImageList  *m_imageList;  // we can have an associated image list
     bool m_ownsImageList;       // true if we must delete m_imageList
+
+    DECLARE_NO_COPY_CLASS(wxNotebookBase)
 };
 
 // ----------------------------------------------------------------------------

include/wx/popupwin.h

@@ -127,6 +127,7 @@ protected:
     wxPopupFocusHandler  *m_handlerFocus;
 
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
+    DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)

include/wx/prntbase.h

@@ -85,6 +85,7 @@ public:
 
 private:
     DECLARE_CLASS(wxPrinterBase)
+    DECLARE_NO_COPY_CLASS(wxPrinterBase)
 };
 
 /*
@@ -150,6 +151,7 @@ private:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintout)
+    DECLARE_NO_COPY_CLASS(wxPrintout)
 };
 
 /*
@@ -178,6 +180,7 @@ private:
 
     DECLARE_CLASS(wxPreviewCanvas)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxPreviewCanvas)
 };
 
 /*
@@ -209,6 +212,7 @@ protected:
 private:
     DECLARE_CLASS(wxPreviewFrame)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxPreviewFrame)
 };
 
 /*
@@ -289,6 +293,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxPreviewControlBar)
 };
 
 /*
@@ -377,6 +382,8 @@ protected:
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+
+    DECLARE_NO_COPY_CLASS(wxPrintPreviewBase)
 };
 
 /*

include/wx/process.h

@@ -128,6 +128,7 @@ protected:
     bool m_redirect;
 
     DECLARE_DYNAMIC_CLASS(wxProcess)
+    DECLARE_NO_COPY_CLASS(wxProcess)
 };
 
 // ----------------------------------------------------------------------------

include/wx/protocol/http.h

@@ -53,6 +53,8 @@ protected:
 
   // deletes the header value strings
   void ClearHeaders();
+
+    DECLARE_NO_COPY_CLASS(wxHTTP)
 };
 
 #endif // wxUSE_PROTOCOL_HTTP

include/wx/protocol/protocol.h

@@ -127,6 +127,7 @@ protected:
     friend class wxURL;
 
     DECLARE_DYNAMIC_CLASS(wxProtoInfo)
+    DECLARE_NO_COPY_CLASS(wxProtoInfo)
 };
 
 #endif // wxUSE_PROTOCOL

include/wx/sckipc.h

@@ -102,6 +102,8 @@ private:
   //
   virtual bool Execute(const wxString& str)
     { return Execute(str, -1, wxIPC_TEXT); }
+
+    DECLARE_NO_COPY_CLASS(wxTCPConnection)
 };
 
 class wxTCPServer: public wxServerBase
@@ -127,6 +129,8 @@ protected:
   // the name of the file associated to the Unix domain socket, may be empty
   wxString m_filename;
 #endif // __UNIX_LIKE__
+
+    DECLARE_NO_COPY_CLASS(wxTCPServer)
 };
 
 class wxTCPClient: public wxClientBase

include/wx/sckstrm.h

@@ -36,6 +36,8 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
   wxSocketBase *m_o_socket;
 
   size_t OnSysWrite(const void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
 };
 
 class WXDLLEXPORT wxSocketInputStream : public wxInputStream
@@ -53,6 +55,8 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream
   wxSocketBase *m_i_socket;
 
   size_t OnSysRead(void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxSocketInputStream)
 };
 
 class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,

include/wx/scrolwin.h

@@ -201,6 +201,8 @@ protected:
 #endif // wxUSE_MOUSEWHEEL
 
     wxScrollHelperEvtHandler *m_handler;
+
+    DECLARE_NO_COPY_CLASS(wxScrollHelper)
 };
 
 // ----------------------------------------------------------------------------

include/wx/sizer.h

@@ -130,6 +130,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxSizerItem);
+    DECLARE_NO_COPY_CLASS(wxSizerItem)
 };
 
 //---------------------------------------------------------------------------
@@ -317,6 +318,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxFlexGridSizer);
+    DECLARE_NO_COPY_CLASS(wxFlexGridSizer)
 };
 
 //---------------------------------------------------------------------------
@@ -373,6 +375,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxStaticBoxSizer);
+    DECLARE_NO_COPY_CLASS(wxStaticBoxSizer)
 };
 
 #endif // wxUSE_STATBOX
@@ -401,6 +404,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxNotebookSizer);
+    DECLARE_NO_COPY_CLASS(wxNotebookSizer)
 };
 
 #endif // wxUSE_NOTEBOOK

include/wx/snglinst.h

@@ -60,6 +60,8 @@ private:
 
     // the implementation details (platform specific)
     class WXDLLEXPORT wxSingleInstanceCheckerImpl *m_impl;
+
+    DECLARE_NO_COPY_CLASS(wxSingleInstanceChecker)
 };
 
 #endif // wxUSE_SNGLINST_CHECKER

include/wx/socket.h

@@ -261,6 +261,8 @@ private:
   wxSockCbk     m_cbk;              // callback
   char         *m_cdata;            // callback data
 #endif // WXWIN_COMPATIBILITY
+
+    DECLARE_NO_COPY_CLASS(wxSocketBase)
 };
 
 

include/wx/statusbr.h

@@ -111,6 +111,8 @@ protected:
     // stacks of previous values for PushStatusText/PopStatusText
     // this is created on demand, use GetStatusStack/GetOrCreateStatusStack
     wxListString **m_statusTextStacks;
+
+    DECLARE_NO_COPY_CLASS(wxStatusBarBase)
 };
 
 // ----------------------------------------------------------------------------

include/wx/stream.h

@@ -98,6 +98,8 @@ protected:
     wxStreamError m_lasterror;
 
     friend class wxStreamBuffer;
+
+    DECLARE_NO_COPY_CLASS(wxInputStream)
 };
 
 // ----------------------------------------------------------------------------
@@ -307,6 +309,8 @@ public:
 
 protected:
     wxInputStream *m_parent_i_stream;
+
+    DECLARE_NO_COPY_CLASS(wxFilterInputStream)
 };
 
 class WXDLLEXPORT wxFilterOutputStream : public wxOutputStream
@@ -322,6 +326,8 @@ public:
 
 protected:
     wxOutputStream *m_parent_o_stream;
+
+    DECLARE_NO_COPY_CLASS(wxFilterOutputStream)
 };
 
 // ============================================================================
@@ -437,6 +443,14 @@ protected:
     bool m_destroybuf,      // deallocate buffer?
          m_fixed,
          m_flushable;
+
+private:
+// Cannot use
+//  DECLARE_NO_COPY_CLASS(wxStreamBuffer)
+// 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:
+    wxStreamBuffer& operator=(const wxStreamBuffer&);
 };
 
 // ---------------------------------------------------------------------------
@@ -471,6 +485,8 @@ protected:
     virtual off_t OnSysTell() const;
 
     wxStreamBuffer *m_i_streambuf;
+
+    DECLARE_NO_COPY_CLASS(wxBufferedInputStream)
 };
 
 // ----------------------------------------------------------------------------
@@ -508,6 +524,8 @@ protected:
     virtual off_t OnSysTell() const;
 
     wxStreamBuffer *m_o_streambuf;
+
+    DECLARE_NO_COPY_CLASS(wxBufferedOutputStream)
 };
 
 #endif // wxUSE_STREAMS

include/wx/tbarbase.h

@@ -234,6 +234,8 @@ protected:
     // short and long help strings
     wxString m_shortHelpString;
     wxString m_longHelpString;
+
+    DECLARE_NO_COPY_CLASS(wxToolBarToolBase)
 };
 
 // a list of toolbar tools

include/wx/timer.h

@@ -103,6 +103,8 @@ protected:
 
     int     m_milli;        // the timer interval
     bool    m_oneShot;      // TRUE if one shot
+
+    DECLARE_NO_COPY_CLASS(wxTimerBase)
 };
 
 // ----------------------------------------------------------------------------