Fixed wxRichTextCtrl base class

[wxWidgets.git] / src / msw / ole / dataobj.cpp

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 3003abdd38bf4fab236fda378e6b3461222327c8..ba2cb10bc83ef1fff0fff953d1da613aeab14322 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -90,7 +90,7 @@ private:
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
 
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
 

-    DECLARE_NO_COPY_CLASS(wxIEnumFORMATETC)
+    wxDECLARE_NO_COPY_CLASS(wxIEnumFORMATETC);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -126,7 +126,7 @@ private:
 
     bool m_mustDelete;
 
 
     bool m_mustDelete;
 

-    DECLARE_NO_COPY_CLASS(wxIDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxIDataObject);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -693,7 +693,7 @@ const void *wxDataObject::GetSizeFromBuffer(const void *buffer,
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const
     const size_t realsz = ::HeapSize(::GetProcessHeap(), 0,
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const
     const size_t realsz = ::HeapSize(::GetProcessHeap(), 0,

-                                     wx_const_cast(void*, buffer));
+                                     const_cast<void*>(buffer));

     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error
     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error


@@ -1199,7 +1199,7 @@ public:
         { return GetDataHere(buf); }
 #endif
 
         { return GetDataHere(buf); }
 #endif
 

-    DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
+    wxDECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject);

 };
 
 
 };