diff --git a/reformat/Reformat.h b/reformat/Reformat.h index 0d8e355..759b6f7 100644 --- a/reformat/Reformat.h +++ b/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) {} + NiftyList(void); // do not instantiate + ~NiftyList(void); /* * Structures for holding data. diff --git a/reformat/ReformatBase.h b/reformat/ReformatBase.h index 535f4d5..de165ad 100644 --- a/reformat/ReformatBase.h +++ b/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 diff --git a/util/CancelDialog.h b/util/CancelDialog.h index bca2ddb..24791d3 100644 --- a/util/CancelDialog.h +++ b/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 */ diff --git a/util/ImageDataObject.h b/util/ImageDataObject.h index e9af2ba..6e323a9 100644 --- a/util/ImageDataObject.h +++ b/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; diff --git a/util/Modeless.h b/util/Modeless.h index fb65c2b..ca98756 100644 --- a/util/Modeless.h +++ b/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; }; diff --git a/util/MyBitmapButton.h b/util/MyBitmapButton.h index 7765d59..c2a486b 100644 --- a/util/MyBitmapButton.h +++ b/util/MyBitmapButton.h @@ -58,6 +58,8 @@ protected: virtual void UpdateBitmap(void); private: + DECLARE_COPY_AND_OPEQ(MyBitmapButton) + HBITMAP fhBitmap; int fBitmapID; diff --git a/util/MyDIBitmap.h b/util/MyDIBitmap.h index 60d8719..2768d62 100644 --- a/util/MyDIBitmap.h +++ b/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 */ diff --git a/util/MyEdit.h b/util/MyEdit.h index d591cd7..8cecc12 100644 --- a/util/MyEdit.h +++ b/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; diff --git a/util/MySpinCtrl.h b/util/MySpinCtrl.h index c193fdf..fe28664 100644 --- a/util/MySpinCtrl.h +++ b/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; /* diff --git a/util/Pidl.h b/util/Pidl.h index 214a560..0930c46 100644 --- a/util/Pidl.h +++ b/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*/ diff --git a/util/ProgressCancelDialog.h b/util/ProgressCancelDialog.h index 503d261..19203a3 100644 --- a/util/ProgressCancelDialog.h +++ b/util/ProgressCancelDialog.h @@ -58,6 +58,8 @@ public: } private: + DECLARE_COPY_AND_OPEQ(ProgressCancelDialog) + BOOL OnInitDialog(void) { CancelDialog::OnInitDialog(); diff --git a/util/SelectFilesDialog.h b/util/SelectFilesDialog.h index e6e7195..2e4876d 100644 --- a/util/SelectFilesDialog.h +++ b/util/SelectFilesDialog.h @@ -110,6 +110,8 @@ protected: virtual void HandleHelp() {} private: + DECLARE_COPY_AND_OPEQ(SelectFilesDialog) + /* * Finishes configuring the file dialog. */ diff --git a/util/ShellTree.h b/util/ShellTree.h index 3603d39..81bd5c8 100644 --- a/util/ShellTree.h +++ b/util/ShellTree.h @@ -208,6 +208,9 @@ protected: BOOL fFolderPathValid; DECLARE_MESSAGE_MAP() + +private: + DECLARE_COPY_AND_OPEQ(ShellTree) }; #endif /*UTIL_SHELLTREE_H*/ diff --git a/util/SoundFile.h b/util/SoundFile.h index c78f03b..cef4c21 100644 --- a/util/SoundFile.h +++ b/util/SoundFile.h @@ -13,6 +13,7 @@ #define UTIL_SOUNDFILE_H #include +#include /* * 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 }; diff --git a/util/Util.h b/util/Util.h index 105b90b..7adbb5d 100644 --- a/util/Util.h +++ b/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) };