X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d834f22c8e4248e8c035643ec1894a4cfd038419..491b5be8305968871bc289453ed088a70c3de044:/src/msw/ole/dataobj.cpp?ds=sidebyside diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 59ca12f9a4..f0b939a5c4 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -28,8 +28,6 @@ #pragma hdrstop #endif -#if defined(__WIN32__) && !defined(__GNUWIN32_OLD__) - #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" @@ -37,9 +35,11 @@ #include "wx/dataobj.h" +#if wxUSE_OLE && defined(__WIN32__) && !defined(__GNUWIN32_OLD__) + #include "wx/msw/private.h" // includes -#ifdef wxUSE_NORLANDER_HEADERS +#if wxUSE_NORLANDER_HEADERS #include #endif #include @@ -73,13 +73,7 @@ class wxIEnumFORMATETC : public IEnumFORMATETC { public: wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount); - - // to suppress the gcc warning about "class has virtual functions but non - // virtual dtor" -#ifdef __GNUG__ - virtual -#endif - ~wxIEnumFORMATETC() { delete [] m_formats; } + virtual ~wxIEnumFORMATETC() { delete [] m_formats; } DECLARE_IUNKNOWN_METHODS; @@ -103,13 +97,7 @@ class wxIDataObject : public IDataObject { public: wxIDataObject(wxDataObject *pDataObject); - - // to suppress the gcc warning about "class has virtual functions but non - // virtual dtor" -#ifdef __GNUG__ - virtual -#endif - ~wxIDataObject(); + 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 @@ -145,7 +133,7 @@ private: void wxDataFormat::SetId(const wxChar *format) { - m_format = ::RegisterClipboardFormat(format); + m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format); if ( !m_format ) { wxLogError(_("Couldn't register clipboard format '%s'."), format); @@ -196,7 +184,7 @@ wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount) STDMETHODIMP wxIEnumFORMATETC::Next(ULONG celt, FORMATETC *rgelt, - ULONG *pceltFetched) + ULONG *WXUNUSED(pceltFetched)) { wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumFORMATETC::Next")); @@ -317,7 +305,7 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) pmedium->hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, sizeof(METAFILEPICT)); if ( !pmedium->hGlobal ) { - wxLogLastError("GlobalAlloc"); + wxLogLastError(wxT("GlobalAlloc")); return E_OUTOFMEMORY; } pmedium->tymed = TYMED_MFPICT; @@ -341,7 +329,7 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size); if ( hGlobal == NULL ) { - wxLogLastError("GlobalAlloc"); + wxLogLastError(wxT("GlobalAlloc")); return E_OUTOFMEMORY; } @@ -457,7 +445,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, // copy data void *pBuf = GlobalLock(pmedium->hGlobal); if ( pBuf == NULL ) { - wxLogLastError("GlobalLock"); + wxLogLastError(wxT("GlobalLock")); return E_OUTOFMEMORY; } @@ -506,6 +494,10 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc, size_t *p = (size_t *)pBuf; size = *p++; pBuf = p; + if (! format.IsStandard() ) { + // see GetData for coresponding increment + size -= sizeof(size_t); + } } } @@ -607,7 +599,7 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc) return S_OK; } -STDMETHODIMP wxIDataObject::GetCanonicalFormatEtc(FORMATETC *pFormatetcIn, +STDMETHODIMP wxIDataObject::GetCanonicalFormatEtc(FORMATETC *WXUNUSED(pFormatetcIn), FORMATETC *pFormatetcOut) { wxLogTrace(wxTRACE_OleCalls, wxT("wxIDataObject::GetCanonicalFormatEtc")); @@ -628,7 +620,8 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDir, : wxDataObject::Set; size_t nFormatCount = m_pDataObject->GetFormatCount(dir); - wxDataFormat format, *formats; + wxDataFormat format; + wxDataFormat *formats; formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount]; m_pDataObject->GetAllFormats(formats, dir); @@ -647,20 +640,20 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDir, // advise sink functions (not implemented) // ---------------------------------------------------------------------------- -STDMETHODIMP wxIDataObject::DAdvise(FORMATETC *pformatetc, - DWORD advf, - IAdviseSink *pAdvSink, - DWORD *pdwConnection) +STDMETHODIMP wxIDataObject::DAdvise(FORMATETC *WXUNUSED(pformatetc), + DWORD WXUNUSED(advf), + IAdviseSink *WXUNUSED(pAdvSink), + DWORD *WXUNUSED(pdwConnection)) { return OLE_E_ADVISENOTSUPPORTED; } -STDMETHODIMP wxIDataObject::DUnadvise(DWORD dwConnection) +STDMETHODIMP wxIDataObject::DUnadvise(DWORD WXUNUSED(dwConnection)) { return OLE_E_ADVISENOTSUPPORTED; } -STDMETHODIMP wxIDataObject::EnumDAdvise(IEnumSTATDATA **ppenumAdvise) +STDMETHODIMP wxIDataObject::EnumDAdvise(IEnumSTATDATA **WXUNUSED(ppenumAdvise)) { return OLE_E_ADVISENOTSUPPORTED; } @@ -691,37 +684,37 @@ void wxDataObject::SetAutoDelete() #ifdef __WXDEBUG__ -const char *wxDataObject::GetFormatName(wxDataFormat format) +const wxChar *wxDataObject::GetFormatName(wxDataFormat format) { // case 'xxx' is not a valid value for switch of enum 'wxDataFormat' #ifdef __VISUALC__ #pragma warning(disable:4063) #endif // VC++ - static char s_szBuf[256]; + static wxChar s_szBuf[256]; switch ( format ) { - case CF_TEXT: return "CF_TEXT"; - case CF_BITMAP: return "CF_BITMAP"; - case CF_METAFILEPICT: return "CF_METAFILEPICT"; - case CF_SYLK: return "CF_SYLK"; - case CF_DIF: return "CF_DIF"; - case CF_TIFF: return "CF_TIFF"; - case CF_OEMTEXT: return "CF_OEMTEXT"; - case CF_DIB: return "CF_DIB"; - case CF_PALETTE: return "CF_PALETTE"; - case CF_PENDATA: return "CF_PENDATA"; - case CF_RIFF: return "CF_RIFF"; - case CF_WAVE: return "CF_WAVE"; - case CF_UNICODETEXT: return "CF_UNICODETEXT"; - case CF_ENHMETAFILE: return "CF_ENHMETAFILE"; - case CF_HDROP: return "CF_HDROP"; - case CF_LOCALE: return "CF_LOCALE"; + 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"); + case CF_OEMTEXT: return wxT("CF_OEMTEXT"); + case CF_DIB: return wxT("CF_DIB"); + case CF_PALETTE: return wxT("CF_PALETTE"); + case CF_PENDATA: return wxT("CF_PENDATA"); + case CF_RIFF: return wxT("CF_RIFF"); + case CF_WAVE: return wxT("CF_WAVE"); + case CF_UNICODETEXT: return wxT("CF_UNICODETEXT"); + case CF_ENHMETAFILE: return wxT("CF_ENHMETAFILE"); + case CF_HDROP: return wxT("CF_HDROP"); + case CF_LOCALE: return wxT("CF_LOCALE"); default: if ( !::GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)) ) { // it must be a new predefined format we don't know the name of - sprintf(s_szBuf, "unknown CF (0x%04x)", format.GetFormatId()); + wxSprintf(s_szBuf, wxT("unknown CF (0x%04x)"), format.GetFormatId()); } return s_szBuf; @@ -748,7 +741,7 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const return wxConvertBitmapToDIB((LPBITMAPINFO)buf, GetBitmap()) != 0; } -bool wxBitmapDataObject::SetData(size_t len, const void *buf) +bool wxBitmapDataObject::SetData(size_t WXUNUSED(len), const void *buf) { wxBitmap bitmap(wxConvertDIBToBitmap((const LPBITMAPINFO)buf)); @@ -792,7 +785,7 @@ bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf) BITMAP bmp; if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) ) { - wxLogLastError("GetObject(HBITMAP)"); + wxLogLastError(wxT("GetObject(HBITMAP)")); } wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes); @@ -827,7 +820,7 @@ size_t wxBitmapDataObject::GetDataSize(const wxDataFormat& format) const if ( !GetDIBits(hdc, (HBITMAP)m_bitmap.GetHBITMAP(), 0, 0, NULL, &bi, DIB_RGB_COLORS) ) { - wxLogLastError("GetDIBits(NULL)"); + wxLogLastError(wxT("GetDIBits(NULL)")); return 0; } @@ -860,7 +853,7 @@ bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format, BITMAPINFO *pbi = (BITMAPINFO *)pBuf; if ( !GetDIBits(hdc, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS) ) { - wxLogLastError("GetDIBits(NULL)"); + wxLogLastError(wxT("GetDIBits(NULL)")); return 0; } @@ -869,7 +862,7 @@ bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format, if ( !GetDIBits(hdc, hbmp, 0, pbi->bmiHeader.biHeight, pbi + 1, pbi, DIB_RGB_COLORS) ) { - wxLogLastError("GetDIBits"); + wxLogLastError(wxT("GetDIBits")); return FALSE; } @@ -899,7 +892,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format, pbmi + 1, pbmi, DIB_RGB_COLORS); if ( !hbmp ) { - wxLogLastError("CreateDIBitmap"); + wxLogLastError(wxT("CreateDIBitmap")); } m_bitmap.SetWidth(pbmih->biWidth); @@ -913,7 +906,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format, BITMAP bmp; if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) ) { - wxLogLastError("GetObject(HBITMAP)"); + wxLogLastError(wxT("GetObject(HBITMAP)")); } m_bitmap.SetWidth(bmp.bmWidth); @@ -963,8 +956,8 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData) m_filenames.Add(str); if ( len2 != len - 1 ) { - wxLogDebug(wxT("In wxFileDropTarget::OnDrop DragQueryFile returned" - " %d characters, %d expected."), len2, len - 1); + wxLogDebug(wxT("In wxFileDropTarget::OnDrop DragQueryFile returned\ + %d characters, %d expected."), len2, len - 1); } } @@ -1087,7 +1080,7 @@ size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap) HBITMAP hbmp = (HBITMAP)bitmap.GetHBITMAP(); if ( !GetObject(hbmp, sizeof(bm), &bm) ) { - wxLogLastError("GetObject(bitmap)"); + wxLogLastError(wxT("GetObject(bitmap)")); return 0; } @@ -1095,7 +1088,7 @@ size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap) // 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 = wxGetNumOfBitmapColors(biBits); + WORD biColors = (WORD)wxGetNumOfBitmapColors(biBits); BITMAPINFO bi2; @@ -1125,7 +1118,7 @@ size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap) ScreenHDC hdc; if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, NULL, pbi, DIB_RGB_COLORS) ) { - wxLogLastError("GetDIBits(NULL)"); + wxLogLastError(wxT("GetDIBits(NULL)")); return 0; } @@ -1140,7 +1133,7 @@ size_t wxConvertBitmapToDIB(LPBITMAPINFO pbi, const wxBitmap& bitmap) void *image = (char *)pbi + dwLen; if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, image, pbi, DIB_RGB_COLORS) ) { - wxLogLastError("GetDIBits"); + wxLogLastError(wxT("GetDIBits")); return 0; } @@ -1163,7 +1156,7 @@ wxBitmap wxConvertDIBToBitmap(const LPBITMAPINFO pbmi) image, pbmi, DIB_RGB_COLORS); if ( !hbmp ) { - wxLogLastError("CreateDIBitmap"); + wxLogLastError(wxT("CreateDIBitmap")); } wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount); @@ -1193,5 +1186,29 @@ static const wxChar *GetTymedName(DWORD tymed) #endif // Debug -#endif // not using OLE at all +#else // not using OLE at all +// ---------------------------------------------------------------------------- +// wxDataObject +// ---------------------------------------------------------------------------- + +wxDataObject::wxDataObject() +{ +} + +wxDataObject::~wxDataObject() +{ +} + +void wxDataObject::SetAutoDelete() +{ +} + +#ifdef __WXDEBUG__ +const wxChar *wxDataObject::GetFormatName(wxDataFormat format) +{ + return NULL; +} +#endif + +#endif