#include "wx/msw/private.h" // includes <windows.h>
-#ifdef wxUSE_NORLANDER_HEADERS
+#if wxUSE_NORLANDER_HEADERS
#include <ole2.h>
#endif
#include <oleauto.h>
{
public:
wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);
- ~wxIEnumFORMATETC() { delete [] m_formats; }
+ virtual ~wxIEnumFORMATETC() { delete [] m_formats; }
DECLARE_IUNKNOWN_METHODS;
{
public:
wxIDataObject(wxDataObject *pDataObject);
- ~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
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);
STDMETHODIMP wxIEnumFORMATETC::Next(ULONG celt,
FORMATETC *rgelt,
- ULONG *pceltFetched)
+ ULONG *WXUNUSED(pceltFetched))
{
wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumFORMATETC::Next"));
pmedium->hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE,
sizeof(METAFILEPICT));
if ( !pmedium->hGlobal ) {
- wxLogLastError("GlobalAlloc");
+ wxLogLastError(wxT("GlobalAlloc"));
return E_OUTOFMEMORY;
}
pmedium->tymed = TYMED_MFPICT;
HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
if ( hGlobal == NULL ) {
- wxLogLastError("GlobalAlloc");
+ wxLogLastError(wxT("GlobalAlloc"));
return E_OUTOFMEMORY;
}
// copy data
void *pBuf = GlobalLock(pmedium->hGlobal);
if ( pBuf == NULL ) {
- wxLogLastError("GlobalLock");
+ wxLogLastError(wxT("GlobalLock"));
return E_OUTOFMEMORY;
}
break;
#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
case CF_UNICODETEXT:
- size = wcslen((const wchar_t *)pBuf);
+#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
+ size = std::wcslen((const wchar_t *)pBuf);
+#else
+ size = ::wcslen((const wchar_t *)pBuf);
+#endif
break;
#endif
case CF_BITMAP:
size_t *p = (size_t *)pBuf;
size = *p++;
pBuf = p;
+ if (! format.IsStandard() ) {
+ // see GetData for coresponding increment
+ size -= sizeof(size_t);
+ }
}
}
return S_OK;
}
-STDMETHODIMP wxIDataObject::GetCanonicalFormatEtc(FORMATETC *pFormatetcIn,
+STDMETHODIMP wxIDataObject::GetCanonicalFormatEtc(FORMATETC *WXUNUSED(pFormatetcIn),
FORMATETC *pFormatetcOut)
{
wxLogTrace(wxTRACE_OleCalls, wxT("wxIDataObject::GetCanonicalFormatEtc"));
: 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);
// 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;
}
#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)) )
+ 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);
+ wxSprintf(s_szBuf, wxT("unknown CF (0x%04x)"), format.GetFormatId());
}
return s_szBuf;
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));
BITMAP bmp;
if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) )
{
- wxLogLastError("GetObject(HBITMAP)");
+ wxLogLastError(wxT("GetObject(HBITMAP)"));
}
wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes);
if ( !GetDIBits(hdc, (HBITMAP)m_bitmap.GetHBITMAP(), 0, 0,
NULL, &bi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits(NULL)");
+ wxLogLastError(wxT("GetDIBits(NULL)"));
return 0;
}
BITMAPINFO *pbi = (BITMAPINFO *)pBuf;
if ( !GetDIBits(hdc, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits(NULL)");
+ wxLogLastError(wxT("GetDIBits(NULL)"));
return 0;
}
if ( !GetDIBits(hdc, hbmp, 0, pbi->bmiHeader.biHeight, pbi + 1,
pbi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits");
+ wxLogLastError(wxT("GetDIBits"));
return FALSE;
}
pbmi + 1, pbmi, DIB_RGB_COLORS);
if ( !hbmp )
{
- wxLogLastError("CreateDIBitmap");
+ wxLogLastError(wxT("CreateDIBitmap"));
}
m_bitmap.SetWidth(pbmih->biWidth);
BITMAP bmp;
if ( !GetObject(hbmp, sizeof(BITMAP), &bmp) )
{
- wxLogLastError("GetObject(HBITMAP)");
+ wxLogLastError(wxT("GetObject(HBITMAP)"));
}
m_bitmap.SetWidth(bmp.bmWidth);
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);
}
}
HBITMAP hbmp = (HBITMAP)bitmap.GetHBITMAP();
if ( !GetObject(hbmp, sizeof(bm), &bm) )
{
- wxLogLastError("GetObject(bitmap)");
+ 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 = wxGetNumOfBitmapColors(biBits);
+ WORD biColors = (WORD)wxGetNumOfBitmapColors(biBits);
BITMAPINFO bi2;
ScreenHDC hdc;
if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, NULL, pbi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits(NULL)");
+ wxLogLastError(wxT("GetDIBits(NULL)"));
return 0;
}
void *image = (char *)pbi + dwLen;
if ( !GetDIBits(hdc, hbmp, 0, bi.biHeight, image, pbi, DIB_RGB_COLORS) )
{
- wxLogLastError("GetDIBits");
+ wxLogLastError(wxT("GetDIBits"));
return 0;
}
image, pbmi, DIB_RGB_COLORS);
if ( !hbmp )
{
- wxLogLastError("CreateDIBitmap");
+ wxLogLastError(wxT("CreateDIBitmap"));
}
wxBitmap bitmap(pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount);
case TYMED_MFPICT: return wxT("TYMED_MFPICT");
case TYMED_ENHMF: return wxT("TYMED_ENHMF");
default:
- wxSprintf(s_szBuf, wxT("type of media format %d (unknown)"), tymed);
+ wxSprintf(s_szBuf, wxT("type of media format %ld (unknown)"), tymed);
return s_szBuf;
}
}
projects / wxWidgets.git / blobdiff