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

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 7439b3570f64edac4a7f71817484929c2a12e32d..0c110f0a2020aeed47e74a268d5ceb6624f5b9dd 100644 (file)
--- 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 6b1d39d41d1e11ce7ccf5b8fbbd441fafe6de9b4..c836db731d40479b55f9d347a6879b3b78dcdd52 100644 (file)
--- 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 8abc0799ccf3d2ce8ecbd329e05aa03095b84757..f173d69e39c128067db04e7058114e91b4fb06b7 100644 (file)
--- 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 83551e2127fb685457c4947cce49cbf9d28e31f4..c65ac904a9e410d761609b367a0f63f1b195c7ed 100644 (file)
--- 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)
 };
 
 // ----------------------------------------------------------------------------