X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22be0335df28fd3e638c40fe525b6ff323e73c15..e6be3e7c1b059a74f38f60ba93fe710891cc5456:/src/msw/ole/dataobj.cpp diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 0a594fd69f..b5c4b6f593 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -410,6 +410,20 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc, return S_OK; } +#ifdef __DIGITALMARS__ +extern "C" +size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format ); + +extern "C" +const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer, + size_t* size, + const wxDataFormat& format ) ; +extern "C" +void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size, + const wxDataFormat& format ) ; + +#endif + // set data functions STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, STGMEDIUM *pmedium, @@ -439,7 +453,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, // as we can't fix this bug in explorer (it's a bug because it // should only use formats returned by EnumFormatEtc), do the // check here - if ( !m_pDataObject->IsSupportedFormat(format) ) { + if ( !m_pDataObject->IsSupported(format, wxDataObject::Set) ) { // go away! return DV_E_FORMATETC; } @@ -959,6 +973,12 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format, bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData) { +//FIX ME __DIGITALMARS__ +#if defined (__DIGITALMARS__) + //DragQueryFile not in any library + wxLogDebug(wxT("In wxFileDataObject::SetData code not executed - no Digital Mars library ")); + return FALSE; +#endif m_filenames.Empty(); // the documentation states that the first member of DROPFILES structure is