From 00e7a427a081f91b6a657d85c5ab6125fbea4d7c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 2 Jan 2003 23:46:08 +0000 Subject: [PATCH] compilation fixes after applying DECLARE_NO_COPY_CLASS() patch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/html/helpdata.h | 2 +- include/wx/ipcbase.h | 4 +++- include/wx/msw/bitmap.h | 5 +++-- include/wx/stream.h | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index 7439b3570f..0c110f0a20 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -116,7 +116,7 @@ private: bool m_CaseSensitive; bool m_WholeWords; - DECLARE_NO_COPY_CLASS(wxSearchEngine) + DECLARE_NO_COPY_CLASS(wxHtmlSearchEngine) }; diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index 6b1d39d41d..c836db731d 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -123,7 +123,9 @@ private: size_t m_buffersize; bool m_deletebufferwhendone; - DECLARE_NO_COPY_CLASS(wxConnectionBase) + // can't use DECLARE_NO_COPY_CLASS(wxConnectionBase) because we already + // have copy ctor but still forbid the default assignment operator + wxConnectionBase& operator=(const wxConnectionBase&); }; diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 8abc0799cc..f173d69e39 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -64,11 +64,12 @@ 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 + + + DECLARE_NO_COPY_CLASS(wxBitmapRefData) }; // ---------------------------------------------------------------------------- diff --git a/include/wx/stream.h b/include/wx/stream.h index 83551e2127..c65ac904a9 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -99,7 +99,7 @@ protected: friend class wxStreamBuffer; - DECLARE_NO_COPY_CLASS(wxInputStream) + DECLARE_NO_COPY_CLASS(wxStreamBase) }; // ---------------------------------------------------------------------------- -- 2.47.2