X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9205cb3f269c523d8dbe5380c5cedb9cb6aae8e7..d946915c2039f02793670f91d707bee26cd6f88e:/src/msw/ole/dataobj.cpp diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 12858fb2b6..73924fa3e2 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -106,7 +106,7 @@ public: virtual ~wxIDataObject(); // normally, wxDataObject controls our lifetime (i.e. we're deleted when it - // is), but in some cases, the situation is inversed, that is we delete it + // is), but in some cases, the situation is reversed, that is we delete it // when this object is deleted - setting this flag enables such logic void SetDeleteFlag() { m_mustDelete = true; } @@ -500,7 +500,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, // we suppose that the size precedes the data pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format ); if (! format.IsStandard() ) { - // see GetData for coresponding increment + // see GetData for corresponding increment size -= m_pDataObject->GetBufferOffset( format ); } } @@ -979,7 +979,8 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format, // wxFileDataObject // ---------------------------------------------------------------------------- -bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData) +bool wxFileDataObject::SetData(size_t WXUNUSED(size), + const void *WXUNUSED_IN_WINCE(pData)) { #ifndef __WXWINCE__ m_filenames.Empty(); @@ -1015,7 +1016,6 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData) return true; #else - wxUnusedVar(pData); return false; #endif } @@ -1055,7 +1055,7 @@ size_t wxFileDataObject::GetDataSize() const #endif } -bool wxFileDataObject::GetDataHere(void *pData) const +bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const { #ifndef __WXWINCE__ // pData points to an externally allocated memory block @@ -1095,7 +1095,6 @@ bool wxFileDataObject::GetDataHere(void *pData) const return true; #else - wxUnusedVar(pData); return false; #endif }