X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afd23c224adf19f62353d8ec309db91747cbf237..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/msw/ole/dataobj.cpp?ds=sidebyside diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index b00c440a15..e26a1ea1d5 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 ); } } @@ -1224,6 +1224,7 @@ static const wxChar *GetTymedName(DWORD tymed) #endif // Debug #else // not using OLE at all + // ---------------------------------------------------------------------------- // wxDataObject // ---------------------------------------------------------------------------- @@ -1243,13 +1244,14 @@ void wxDataObject::SetAutoDelete() } #ifdef __WXDEBUG__ -const wxChar *wxDataObject::GetFormatName(wxDataFormat format) +const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format)) { return NULL; } -#endif +#endif // __WXDEBUG__ -#endif +#endif // wxUSE_DATAOBJ + +#endif // wxUSE_OLE/!wxUSE_OLE -#endif