Add DECLARE_COPY_AND_OPEQ to util classes

Make operator= and the copy constructor private in all of the classes
in the utility library and the base classes in reformat.

reformat/Reformat.h

@@ -332,6 +332,8 @@ protected:
     const char* GetNameExt(void) const { return fNameExt; }
 
 private:
+    DECLARE_COPY_AND_OPEQ(ReformatHolder)
+
     /*
      * Utility functions.
      */
@@ -427,6 +429,8 @@ public:
     }
 
 private:
+    DECLARE_COPY_AND_OPEQ(ReformatOutput)
+
     /* what we're holding */
     OutputKind      fOutputKind;
     //ReformatID        fOutputID;
@@ -482,8 +486,8 @@ public:
     }
 
 private:
-    NiftyList(void) { assert(false); }
+    NiftyList(void);        // do not instantiate
-    ~NiftyList(void) {}
+    ~NiftyList(void);
 
     /*
      * Structures for holding data.

reformat/ReformatBase.h

@@ -131,6 +131,9 @@ public:
         else
             return Get32BE(buf);
     }
+
+private:
+    DECLARE_COPY_AND_OPEQ(Reformat)
 };
 
 /*
@@ -164,6 +167,8 @@ protected:
         uint8_t** pOutPtr, long dstLen, uint8_t xorVal);
 
 private:
+    DECLARE_COPY_AND_OPEQ(ReformatGraphics)
+
     void InitPalette();
 };
 
@@ -369,6 +374,7 @@ protected:
     void CheckGSCharConv(void);
 
 private:
+    DECLARE_COPY_AND_OPEQ(ReformatText)
     int CreateWorkBuf(void);
     enum { kRTFUnitsPerInch = 1440 };   // TWIPS
 

util/CancelDialog.h

@@ -36,6 +36,8 @@ protected:
     bool*   fpCancelFlag;
 
 private:
+    DECLARE_COPY_AND_OPEQ(CancelDialog)
+
     /* override Cancel button to just raise the flag */
     virtual void OnCancel(void) override {
         /* "cancel" button or escape hit */

util/ImageDataObject.h

@@ -34,6 +34,8 @@ public:
     static void InsertBitmap(IRichEditOle* pRichEditOle, HBITMAP hBitmap);
 
 private:
+    DECLARE_COPY_AND_OPEQ(CImageDataObject)
+
     ULONG   m_ulRefCnt;
     BOOL    m_bRelease;
 

util/Modeless.h

@@ -53,6 +53,8 @@ protected:
     }
 
 private:
+    DECLARE_COPY_AND_OPEQ(ModelessDialog)
+
     bool fOkayToDelete;     // sanity check
 };
 
@@ -84,6 +86,8 @@ public:
     }
 
 private:
+    DECLARE_COPY_AND_OPEQ(ExclusiveModelessDialog)
+
     CWnd*   fpParentWnd;
 };
 

util/MyBitmapButton.h

@@ -58,6 +58,8 @@ protected:
     virtual void UpdateBitmap(void);
 
 private:
+    DECLARE_COPY_AND_OPEQ(MyBitmapButton)
+
     HBITMAP     fhBitmap;
     int         fBitmapID;
 

util/MyDIBitmap.h

@@ -201,6 +201,8 @@ public:
         const MyDIBitmap* pSrcBits, const RECT* pSrcRect);
 
 private:
+    DECLARE_COPY_AND_OPEQ(MyDIBitmap)
+
     enum { kBMPMagic = 0x4d42 };            // "BM"
 
     /* for .TGA files; does not map directly to file */

util/MyEdit.h

@@ -43,6 +43,8 @@ public:
     virtual BOOL ReplaceDlgCtrl(CDialog* pDialog, int editID);
 
 private:
+    DECLARE_COPY_AND_OPEQ(MyEdit)
+
     virtual BOOL PreTranslateMessage(MSG* pMsg) override;
 
     bool        fCapsOnly;

util/MySpinCtrl.h

@@ -40,6 +40,8 @@ protected:
     afx_msg void OnDeltaPos(NMHDR* pNMHDR, LRESULT* pResult);
 
 private:
+    DECLARE_COPY_AND_OPEQ(MySpinCtrl)
+
     int fLow, fHigh;
 
     /*

util/Pidl.h

@@ -83,6 +83,10 @@ public:
      * specifies which of the object's icons to retrieve.
      */
     static int GetItemIcon(LPITEMIDLIST lpi, UINT uFlags);
+
+private:
+    Pidl();     // do not instantiate
+    ~Pidl();
 };
 
 #endif /*UTIL_PIDL_H*/

util/ProgressCancelDialog.h

@@ -58,6 +58,8 @@ public:
     }
 
 private:
+    DECLARE_COPY_AND_OPEQ(ProgressCancelDialog)
+
     BOOL OnInitDialog(void) {
         CancelDialog::OnInitDialog();
 

util/SelectFilesDialog.h

@@ -110,6 +110,8 @@ protected:
     virtual void HandleHelp() {}
 
 private:
+    DECLARE_COPY_AND_OPEQ(SelectFilesDialog)
+
     /*
      * Finishes configuring the file dialog.
      */

util/ShellTree.h

@@ -208,6 +208,9 @@ protected:
     BOOL    fFolderPathValid;
 
     DECLARE_MESSAGE_MAP()
+
+private:
+    DECLARE_COPY_AND_OPEQ(ShellTree)
 };
 
 #endif /*UTIL_SHELLTREE_H*/

util/SoundFile.h

@@ -13,6 +13,7 @@
 #define UTIL_SOUNDFILE_H
 
 #include <mmsystem.h>
+#include <stdint.h>
 
 /*
  * Class providing read-only access to uncompressed sound samples and
@@ -66,6 +67,8 @@ public:
     }
 
 private:
+    DECLARE_COPY_AND_OPEQ(SoundFile)
+
     int SkipToHeader(uint32_t hdrID, uint32_t* pChunkLen);
 
     enum { kWAVMinSize = 40 };

util/Util.h

@@ -35,6 +35,9 @@ public:
 
     const char* fBuf;
     long        fLen;
+
+private:
+    DECLARE_COPY_AND_OPEQ(RichEditXfer)
 };
 
 
@@ -97,6 +100,9 @@ protected:
     char*       fWorkBuf;       // work in progress
     long        fWorkCount;     // quantity of data in buffer
     long        fWorkMax;       // maximum size of buffer
+
+private:
+    DECLARE_COPY_AND_OPEQ(ExpandBuffer)
 };