X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcbd7ce2d7df2338baa13542f0cdd52619066ada..dc302518e6bf48326d202475bf78874fedcb2d9c:/src/msw/ole/dataobj.cpp?ds=sidebyside diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index d27cd12afe..48377785a4 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -6,7 +6,7 @@ // Created: 10.05.98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dataobj.h" #endif @@ -39,16 +39,16 @@ #include "wx/msw/private.h" // includes -#if wxUSE_NORLANDER_HEADERS - #include +#ifdef __WXWINCE__ +#include #endif -#include -#ifndef __WIN32__ +// for some compilers, the entire ole2.h must be included, not only oleauto.h +#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__) || defined(__WXWINCE__) #include - #include #endif +#include #include #include "wx/msw/ole/oleutils.h" @@ -59,7 +59,6 @@ #define CFSTR_SHELLURL _T("UniformResourceLocator") #endif - // ---------------------------------------------------------------------------- // functions // ---------------------------------------------------------------------------- @@ -67,7 +66,7 @@ #ifdef __WXDEBUG__ static const wxChar *GetTymedName(DWORD tymed); #else // !Debug - #define GetTymedName(tymed) _T("") + #define GetTymedName(tymed) wxEmptyString #endif // Debug/!Debug // ---------------------------------------------------------------------------- @@ -92,6 +91,8 @@ private: CLIPFORMAT *m_formats; // formats we can provide data in ULONG m_nCount, // number of formats we support m_nCurrent; // current enum position + + DECLARE_NO_COPY_CLASS(wxIEnumFORMATETC) }; // ---------------------------------------------------------------------------- @@ -126,6 +127,8 @@ private: wxDataObject *m_pDataObject; // pointer to C++ class we belong to bool m_mustDelete; + + DECLARE_NO_COPY_CLASS(wxIDataObject) }; // ============================================================================ @@ -154,8 +157,7 @@ wxString wxDataFormat::GetId() const wxCHECK_MSG( !IsStandard(), s, wxT("name of predefined format cannot be retrieved") ); - int len = ::GetClipboardFormatName(m_format, s.GetWriteBuf(max), max); - s.UngetWriteBuf(); + int len = ::GetClipboardFormatName(m_format, wxStringBuffer(s, max), max); if ( !len ) { @@ -178,7 +180,6 @@ IMPLEMENT_IUNKNOWN_METHODS(wxIEnumFORMATETC) wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount) { - m_cRef = 0; m_nCurrent = 0; m_nCount = nCount; m_formats = new CLIPFORMAT[nCount]; @@ -189,31 +190,27 @@ wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount) STDMETHODIMP wxIEnumFORMATETC::Next(ULONG celt, FORMATETC *rgelt, - ULONG *WXUNUSED(pceltFetched)) + ULONG *pceltFetched) { wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumFORMATETC::Next")); - if ( celt > 1 ) { - // we only return 1 element at a time - mainly because I'm too lazy to - // implement something which you're never asked for anyhow - return S_FALSE; - } - - if ( m_nCurrent < m_nCount ) { + ULONG numFetched = 0; + while (m_nCurrent < m_nCount && numFetched < celt) { FORMATETC format; format.cfFormat = m_formats[m_nCurrent++]; format.ptd = NULL; format.dwAspect = DVASPECT_CONTENT; format.lindex = -1; format.tymed = TYMED_HGLOBAL; - *rgelt = format; - return S_OK; - } - else { - // bad index - return S_FALSE; + *rgelt++ = format; + numFetched++; } + + if (pceltFetched) + *pceltFetched = numFetched; + + return numFetched == celt ? S_OK : S_FALSE; } STDMETHODIMP wxIEnumFORMATETC::Skip(ULONG celt) @@ -269,7 +266,6 @@ IMPLEMENT_IUNKNOWN_METHODS(wxIDataObject) wxIDataObject::wxIDataObject(wxDataObject *pDataObject) { - m_cRef = 0; m_pDataObject = pDataObject; m_mustDelete = FALSE; } @@ -294,7 +290,7 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) // for the bitmaps and metafiles we use the handles instead of global memory // to pass the data - wxDataFormat format = (wxDataFormatId)pformatetcIn->cfFormat; + wxDataFormat format = (wxDataFormat::NativeFormat)pformatetcIn->cfFormat; switch ( format ) { @@ -306,6 +302,7 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) pmedium->tymed = TYMED_ENHMF; break; +#ifndef __WXWINCE__ case wxDF_METAFILE: pmedium->hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(METAFILEPICT)); @@ -315,7 +312,7 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) } pmedium->tymed = TYMED_MFPICT; break; - +#endif default: // alloc memory size_t size = m_pDataObject->GetDataSize(format); @@ -329,7 +326,9 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) if ( !format.IsStandard() ) { // for custom formats, put the size with the data - alloc the // space for it - size += sizeof(size_t); + // MB: not completely sure this is correct, + // even if I can't figure out what's wrong + size += m_pDataObject->GetBufferOffset( format ); } HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size); @@ -391,14 +390,12 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc, return E_OUTOFMEMORY; } - if ( !wxDataFormat(pformatetc->cfFormat).IsStandard() ) { + wxDataFormat format = pformatetc->cfFormat; + if ( !format.IsStandard() ) { // for custom formats, put the size with the data - size_t *p = (size_t *)pBuf; - *p++ = GlobalSize(hGlobal); - pBuf = p; + pBuf = m_pDataObject->SetSizeInBuffer( pBuf, GlobalSize(hGlobal), format ); } - wxDataFormat format = pformatetc->cfFormat; if ( !m_pDataObject->GetDataHere(format, pBuf) ) return E_UNEXPECTED; @@ -413,6 +410,7 @@ STDMETHODIMP wxIDataObject::GetDataHere(FORMATETC *pformatetc, return S_OK; } + // set data functions STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, STGMEDIUM *pmedium, @@ -442,13 +440,13 @@ 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; } // copy data - void *pBuf = GlobalLock(pmedium->hGlobal); + const void *pBuf = GlobalLock(pmedium->hGlobal); if ( pBuf == NULL ) { wxLogLastError(wxT("GlobalLock")); @@ -469,19 +467,22 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, break; #if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500)) case CF_UNICODETEXT: -#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530)) - size = std::wcslen((const wchar_t *)pBuf); +#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \ + || ( defined(__MWERKS__) && defined(__WXMSW__) ) + size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t); #else - size = ::wcslen((const wchar_t *)pBuf); + size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t); #endif break; #endif case CF_BITMAP: +#ifndef __WXWINCE__ case CF_HDROP: // these formats don't use size at all, anyhow (but // pass data by handle, which is always a single DWORD) size = 0; break; +#endif case CF_DIB: // the handler will calculate size itself (it's too @@ -489,19 +490,18 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, size = 0; break; +#ifndef __WXWINCE__ case CF_METAFILEPICT: size = sizeof(METAFILEPICT); break; - +#endif default: { // we suppose that the size precedes the data - size_t *p = (size_t *)pBuf; - size = *p++; - pBuf = p; + pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format ); if (! format.IsStandard() ) { // see GetData for coresponding increment - size -= sizeof(size_t); + size -= m_pDataObject->GetBufferOffset( format ); } } } @@ -558,7 +558,7 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc) // the only one allowed by current COM implementation if ( pformatetc->lindex != -1 ) { wxLogTrace(wxTRACE_OleCalls, - wxT("wxIDataObject::QueryGetData: bad lindex %d"), + wxT("wxIDataObject::QueryGetData: bad lindex %ld"), pformatetc->lindex); return DV_E_LINDEX; @@ -567,7 +567,7 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc) // we don't support anything other (THUMBNAIL, ICON, DOCPRINT...) if ( pformatetc->dwAspect != DVASPECT_CONTENT ) { wxLogTrace(wxTRACE_OleCalls, - wxT("wxIDataObject::QueryGetData: bad dwAspect %d"), + wxT("wxIDataObject::QueryGetData: bad dwAspect %ld"), pformatetc->dwAspect); return DV_E_DVASPECT; @@ -687,6 +687,29 @@ void wxDataObject::SetAutoDelete() m_pIDataObject = NULL; } +size_t wxDataObject::GetBufferOffset( const wxDataFormat& WXUNUSED(format) ) +{ + return sizeof(size_t); +} + +const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size, + const wxDataFormat& WXUNUSED(format) ) +{ + size_t* p = (size_t*)buffer; + *size = *p; + + return p + 1; +} + +void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size, + const wxDataFormat& WXUNUSED(format) ) +{ + size_t* p = (size_t*)buffer; + *p = size; + + return p + 1; +} + #ifdef __WXDEBUG__ const wxChar *wxDataObject::GetFormatName(wxDataFormat format) @@ -700,7 +723,6 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format) switch ( format ) { case CF_TEXT: return wxT("CF_TEXT"); case CF_BITMAP: return wxT("CF_BITMAP"); - case CF_METAFILEPICT: return wxT("CF_METAFILEPICT"); case CF_SYLK: return wxT("CF_SYLK"); case CF_DIF: return wxT("CF_DIF"); case CF_TIFF: return wxT("CF_TIFF"); @@ -711,9 +733,12 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format) case CF_RIFF: return wxT("CF_RIFF"); case CF_WAVE: return wxT("CF_WAVE"); case CF_UNICODETEXT: return wxT("CF_UNICODETEXT"); +#ifndef __WXWINCE__ + case CF_METAFILEPICT: return wxT("CF_METAFILEPICT"); case CF_ENHMETAFILE: return wxT("CF_ENHMETAFILE"); - case CF_HDROP: return wxT("CF_HDROP"); case CF_LOCALE: return wxT("CF_LOCALE"); + case CF_HDROP: return wxT("CF_HDROP"); +#endif default: if ( !::GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)) ) @@ -736,29 +761,49 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format) // wxBitmapDataObject supports CF_DIB format // ---------------------------------------------------------------------------- +// TODO: support CF_DIB under Windows CE as well + size_t wxBitmapDataObject::GetDataSize() const { - return wxConvertBitmapToDIB(NULL, GetBitmap()); +#if wxUSE_WXDIB && !defined(__WXWINCE__) + return wxDIB::ConvertFromBitmap(NULL, GetHbitmapOf(GetBitmap())); +#else + return 0; +#endif } bool wxBitmapDataObject::GetDataHere(void *buf) const { - return wxConvertBitmapToDIB((LPBITMAPINFO)buf, GetBitmap()) != 0; +#if wxUSE_WXDIB && !defined(__WXWINCE__) + BITMAPINFO * const pbi = (BITMAPINFO *)buf; + + return wxDIB::ConvertFromBitmap(pbi, GetHbitmapOf(GetBitmap())) != 0; +#else + return FALSE; +#endif } bool wxBitmapDataObject::SetData(size_t WXUNUSED(len), const void *buf) { - wxBitmap bitmap(wxConvertDIBToBitmap((const LPBITMAPINFO)buf)); +#if wxUSE_WXDIB && !defined(__WXWINCE__) + const BITMAPINFO * const pbmi = (const BITMAPINFO *)buf; - if ( !bitmap.Ok() ) { - wxFAIL_MSG(wxT("pasting/dropping invalid bitmap")); + HBITMAP hbmp = wxDIB::ConvertToBitmap(pbmi); - return FALSE; - } + wxCHECK_MSG( hbmp, FALSE, wxT("pasting/dropping invalid bitmap") ); + + const BITMAPINFOHEADER * const pbmih = &pbmi->bmiHeader; + wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount); + bitmap.SetHBITMAP((WXHBITMAP)hbmp); + + // TODO: create wxPalette if the bitmap has any SetBitmap(bitmap); return TRUE; +#else + return FALSE; +#endif } // ---------------------------------------------------------------------------- @@ -934,6 +979,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format, bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData) { +#ifndef __WXWINCE__ m_filenames.Empty(); // the documentation states that the first member of DROPFILES structure is @@ -956,8 +1002,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData) // +1 for terminating NUL len = ::DragQueryFile(hdrop, n, NULL, 0) + 1; - UINT len2 = ::DragQueryFile(hdrop, n, str.GetWriteBuf(len), len); - str.UngetWriteBuf(); + UINT len2 = ::DragQueryFile(hdrop, n, wxStringBuffer(str, len), len); m_filenames.Add(str); if ( len2 != len - 1 ) { @@ -967,6 +1012,9 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData) } return TRUE; +#else + return FALSE; +#endif } void wxFileDataObject::AddFile(const wxString& file) @@ -979,6 +1027,7 @@ void wxFileDataObject::AddFile(const wxString& file) size_t wxFileDataObject::GetDataSize() const { +#ifndef __WXWINCE__ // size returned will be the size of the DROPFILES structure, // plus the list of filesnames (null byte separated), plus // a double null at the end @@ -988,20 +1037,24 @@ size_t wxFileDataObject::GetDataSize() const return 0; // inital size of DROPFILES struct + null byte - size_t sz = sizeof(DROPFILES) + 1; + size_t sz = sizeof(DROPFILES) + (1 * sizeof(wxChar)); size_t count = m_filenames.GetCount(); for ( size_t i = 0; i < count; i++ ) { // add filename length plus null byte - sz += m_filenames[i].Len() + 1; + sz += (m_filenames[i].Len() + 1) * sizeof(wxChar); } return sz; +#else + return 0; +#endif } bool wxFileDataObject::GetDataHere(void *pData) const { +#ifndef __WXWINCE__ // pData points to an externally allocated memory block // created using the size returned by GetDataSize() @@ -1029,7 +1082,7 @@ bool wxFileDataObject::GetDataHere(void *pData) const { // copy filename to pbuf and add null terminator size_t len = m_filenames[i].Len(); - memcpy(pbuf, m_filenames[i], len); + memcpy(pbuf, m_filenames[i], len*sizeof(wxChar)); pbuf += len; *pbuf++ = wxT('\0'); } @@ -1038,19 +1091,69 @@ bool wxFileDataObject::GetDataHere(void *pData) const *pbuf = wxT('\0'); return TRUE; +#else + return FALSE; +#endif } // ---------------------------------------------------------------------------- // wxURLDataObject // ---------------------------------------------------------------------------- +class CFSTR_SHELLURLDataObject : public wxCustomDataObject +{ +public: + CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {} +protected: + virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) ) + { + return 0; + } + + virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, + const wxDataFormat& WXUNUSED(format) ) + { + // CFSTR_SHELLURL is _always_ ANSI text + *size = strlen( (const char*)buffer ); + + return buffer; + } + + virtual void* SetSizeInBuffer( void* buffer, size_t WXUNUSED(size), + const wxDataFormat& WXUNUSED(format) ) + { + return buffer; + } + +#if wxUSE_UNICODE + virtual bool GetDataHere( void* buffer ) const + { + // CFSTR_SHELLURL is _always_ ANSI! + wxCharBuffer char_buffer( GetDataSize() ); + wxCustomDataObject::GetDataHere( (void*)char_buffer.data() ); + wxString unicode_buffer( char_buffer, wxConvLibc ); + memcpy( buffer, unicode_buffer.c_str(), + ( unicode_buffer.length() + 1 ) * sizeof(wxChar) ); + + return TRUE; + } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } +#endif + + DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject) +}; + + + wxURLDataObject::wxURLDataObject() { // we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same - // but it seems that some browsers only provideo ne of them so we have to + // but it seems that some browsers only provide one of them so we have to // support both - Add(new wxCustomDataObject(CFSTR_SHELLURL)); Add(new wxTextDataObject); + Add(new CFSTR_SHELLURLDataObject()); // we don't have any data yet m_dataObjectLast = NULL; @@ -1075,142 +1178,25 @@ wxString wxURLDataObject::GetURL() const size_t len = m_dataObjectLast->GetDataSize(); - m_dataObjectLast->GetDataHere(url.GetWriteBuf(len + 1)); - url.UngetWriteBuf(); + m_dataObjectLast->GetDataHere(wxStringBuffer(url, len)); return url; } -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -static size_t wxGetNumOfBitmapColors(size_t bitsPerPixel) -{ - switch ( bitsPerPixel ) - { - case 1: - // monochrome bitmap, 2 entries - return 2; - - case 4: - return 16; - - case 8: - return 256; - - case 24: - // may be used with 24bit bitmaps, but we don't use it here - fall - // through - - case 16: - case 32: - // bmiColors not used at all with these bitmaps - return 0; - - default: - wxFAIL_MSG( wxT("unknown bitmap format") ); - return 0; - } -} - -size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap) +void wxURLDataObject::SetURL(const wxString& url) { - wxASSERT_MSG( bitmap.Ok(), wxT("invalid bmp can't be converted to DIB") ); + SetData(wxDataFormat(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT), + url.Length()+1, url.c_str()); - // shouldn't be selected into a DC or GetDIBits() would fail - wxASSERT_MSG( !bitmap.GetSelectedInto(), - wxT("can't copy bitmap selected into wxMemoryDC") ); - - // prepare all the info we need - BITMAP bm; - HBITMAP hbmp = (HBITMAP)bitmap.GetHBITMAP(); - if ( !GetObject(hbmp, sizeof(bm), &bm) ) - { - wxLogLastError(wxT("GetObject(bitmap)")); - - return 0; - } - - // calculate the number of bits per pixel and the number of items in - // bmiColors array (whose meaning depends on the bitmap format) - WORD biBits = bm.bmPlanes * bm.bmBitsPixel; - WORD biColors = (WORD)wxGetNumOfBitmapColors(biBits); - - BITMAPINFO bi2; - - bool wantSizeOnly = pbi == NULL; - if ( wantSizeOnly ) - pbi = &bi2; - - // just for convenience - BITMAPINFOHEADER& bi = pbi->bmiHeader; - - bi.biSize = sizeof(BITMAPINFOHEADER); - bi.biWidth = bm.bmWidth; - bi.biHeight = bm.bmHeight; - bi.biPlanes = 1; - bi.biBitCount = biBits; - bi.biCompression = BI_RGB; - bi.biSizeImage = 0; - bi.biXPelsPerMeter = 0; - bi.biYPelsPerMeter = 0; - bi.biClrUsed = 0; - bi.biClrImportant = 0; - - // memory we need for BITMAPINFO only - DWORD dwLen = bi.biSize + biColors * sizeof(RGBQUAD); - - // first get the image size - ScreenHDC hdc; - if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, NULL, pbi, DIB_RGB_COLORS) ) - { - wxLogLastError(wxT("GetDIBits(NULL)")); - - return 0; - } - - if ( wantSizeOnly ) - { - // size of the header + size of the image - return dwLen + bi.biSizeImage; - } - - // and now copy the bits - void *image = (char *)pbi + dwLen; - if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, image, pbi, DIB_RGB_COLORS) ) - { - wxLogLastError(wxT("GetDIBits")); - - return 0; - } - - return dwLen + bi.biSizeImage; + // CFSTR_SHELLURL is always supposed to be ANSI... + wxWX2MBbuf urlA = (wxWX2MBbuf)url.mbc_str(); + size_t len = strlen(urlA); + SetData(wxDataFormat(CFSTR_SHELLURL), len+1, (const char*)urlA); } -wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbmi) -{ - // here we get BITMAPINFO struct followed by the actual bitmap bits and - // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info - const BITMAPINFOHEADER *pbmih = &pbmi->bmiHeader; - - // offset of image from the beginning of the header - DWORD ofs = wxGetNumOfBitmapColors(pbmih->biBitCount) * sizeof(RGBQUAD); - void *image = (char *)pbmih + sizeof(BITMAPINFOHEADER) + ofs; - - ScreenHDC hdc; - HBITMAP hbmp = CreateDIBitmap(hdc, pbmih, CBM_INIT, - image, pbmi, DIB_RGB_COLORS); - if ( !hbmp ) - { - wxLogLastError(wxT("CreateDIBitmap")); - } - - wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount); - bitmap.SetHBITMAP((WXHBITMAP)hbmp); - - return bitmap; -} +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- #ifdef __WXDEBUG__ @@ -1238,6 +1224,8 @@ static const wxChar *GetTymedName(DWORD tymed) // wxDataObject // ---------------------------------------------------------------------------- +#if wxUSE_DATAOBJ + wxDataObject::wxDataObject() { } @@ -1259,3 +1247,5 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format) #endif +#endif +