// Created: 10.05.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dataobj.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/msw/private.h" // includes <windows.h>
-#if wxUSE_NORLANDER_HEADERS
- #include <ole2.h>
+#ifdef __WXWINCE__
+#include <winreg.h>
#endif
-#include <oleauto.h>
-#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 <ole2.h>
- #include <olestd.h>
#endif
+#include <oleauto.h>
#include <shlobj.h>
#include "wx/msw/ole/oleutils.h"
#ifdef __WXDEBUG__
static const wxChar *GetTymedName(DWORD tymed);
#else // !Debug
- #define GetTymedName(tymed) _T("")
+ #define GetTymedName(tymed) wxEmptyString
#endif // Debug/!Debug
// ----------------------------------------------------------------------------
wxIEnumFORMATETC(const wxDataFormat* formats, ULONG nCount);
virtual ~wxIEnumFORMATETC() { delete [] m_formats; }
- DECLARE_IUNKNOWN_METHODS;
-
// IEnumFORMATETC
STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched);
STDMETHODIMP Skip(ULONG celt);
STDMETHODIMP Reset();
STDMETHODIMP Clone(IEnumFORMATETC **ppenum);
+ DECLARE_IUNKNOWN_METHODS;
+
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)
};
// ----------------------------------------------------------------------------
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; }
-
- DECLARE_IUNKNOWN_METHODS;
+ void SetDeleteFlag() { m_mustDelete = true; }
// IDataObject
STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium);
STDMETHODIMP DUnadvise(DWORD dwConnection);
STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise);
+ DECLARE_IUNKNOWN_METHODS;
+
private:
wxDataObject *m_pDataObject; // pointer to C++ class we belong to
bool m_mustDelete;
+
+ DECLARE_NO_COPY_CLASS(wxIDataObject)
};
// ============================================================================
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 )
{
wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount)
{
- m_cRef = 0;
m_nCurrent = 0;
m_nCount = nCount;
m_formats = new CLIPFORMAT[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)
wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
{
- m_cRef = 0;
m_pDataObject = pDataObject;
- m_mustDelete = FALSE;
+ m_mustDelete = false;
}
wxIDataObject::~wxIDataObject()
pmedium->tymed = TYMED_ENHMF;
break;
+#ifndef __WXWINCE__
case wxDF_METAFILE:
pmedium->hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE,
sizeof(METAFILEPICT));
}
pmedium->tymed = TYMED_MFPICT;
break;
-
+#endif
default:
// alloc memory
size_t size = m_pDataObject->GetDataSize(format);
return DV_E_FORMATETC;
}
- if ( !format.IsStandard() ) {
- // for custom formats, put the size with the data - alloc the
- // space for it
- // MB: not completely sure this is correct,
- // even if I can't figure out what's wrong
- size += m_pDataObject->GetBufferOffset( format );
- }
+ // we may need extra space for the buffer size
+ size += m_pDataObject->GetBufferOffset( format );
HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, size);
if ( hGlobal == NULL ) {
}
wxDataFormat format = pformatetc->cfFormat;
- if ( !format.IsStandard() ) {
- // for custom formats, put the size with the data
- pBuf = m_pDataObject->SetSizeInBuffer( pBuf, GlobalSize(hGlobal), format );
- }
+
+ // possibly put the size in the beginning of the buffer
+ pBuf = m_pDataObject->SetSizeInBuffer
+ (
+ pBuf,
+ ::GlobalSize(hGlobal),
+ format
+ );
if ( !m_pDataObject->GetDataHere(format, pBuf) )
return E_UNEXPECTED;
return S_OK;
}
+
// set data functions
STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
STGMEDIUM *pmedium,
// 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;
}
case CF_OEMTEXT:
size = strlen((const char *)pBuf);
break;
-#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
+#if !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
case CF_UNICODETEXT:
#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) * sizeof(wchar_t);
+ 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
size = 0;
break;
+#ifndef __WXWINCE__
case CF_METAFILEPICT:
size = sizeof(METAFILEPICT);
break;
-
+#endif
default:
- {
- // we suppose that the size precedes the data
- pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format );
- if (! format.IsStandard() ) {
- // see GetData for coresponding increment
- size -= m_pDataObject->GetBufferOffset( format );
- }
- }
+ pBuf = m_pDataObject->
+ GetSizeFromBuffer(pBuf, &size, format);
+ size -= m_pDataObject->GetBufferOffset(format);
}
bool ok = m_pDataObject->SetData(format, size, pBuf);
// 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;
// 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;
wxDataObject::Direction dir = dwDir == DATADIR_GET ? wxDataObject::Get
: wxDataObject::Set;
- size_t nFormatCount = m_pDataObject->GetFormatCount(dir);
+ ULONG nFormatCount = wx_truncate_cast(ULONG, m_pDataObject->GetFormatCount(dir));
wxDataFormat format;
wxDataFormat *formats;
formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];
m_pIDataObject = NULL;
}
-size_t wxDataObject::GetBufferOffset( const wxDataFormat& WXUNUSED(format) )
+size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )
{
- return sizeof(size_t);
+ // if we prepend the size of the data to the buffer itself, account for it
+ return NeedsVerbatimData(format) ? 0 : sizeof(size_t);
}
const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
- const wxDataFormat& WXUNUSED(format) )
+ const wxDataFormat& format )
{
- size_t* p = (size_t*)buffer;
- *size = *p;
+ size_t realsz = ::HeapSize(::GetProcessHeap(), 0, buffer);
+ if ( realsz == (size_t)-1 )
+ {
+ // note that HeapSize() does not set last error
+ wxLogApiError(wxT("HeapSize"), 0);
+ return NULL;
+ }
+
+ *size = realsz;
+
+ // check if this data has its size prepended (as it was by default for wx
+ // programs prior 2.6.3):
+ size_t *p = (size_t *)buffer;
+ if ( *p == realsz )
+ {
+ if ( NeedsVerbatimData(format) )
+ wxLogDebug(wxT("Apparent data format mismatch: size not needed"));
- return p + 1;
+ p++; // this data has its size prepended; skip first DWORD
+ }
+
+ return p;
}
void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
- const wxDataFormat& WXUNUSED(format) )
+ const wxDataFormat& format )
{
- size_t* p = (size_t*)buffer;
- *p = size;
+ size_t* p = (size_t *)buffer;
+ if ( !NeedsVerbatimData(format) )
+ {
+ // prepend the size to the data and skip it
+ *p++ = size;
+ }
- return p + 1;
+ return p;
}
#ifdef __WXDEBUG__
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");
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)) )
// 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
+ wxUnusedVar(buf);
+ 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;
+ return true;
+#else
+ wxUnusedVar(buf);
+ return false;
+#endif
}
// ----------------------------------------------------------------------------
// we put a bitmap handle into pBuf
*(WXHBITMAP *)pBuf = GetBitmap().GetHBITMAP();
- return TRUE;
+ return true;
}
bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)
if ( !bitmap.Ok() ) {
wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
- return FALSE;
+ return false;
}
SetBitmap(bitmap);
- return TRUE;
+ return true;
}
#if 0
{
wxLogLastError(wxT("GetDIBits"));
- return FALSE;
+ return false;
}
}
else // CF_BITMAP
*(HBITMAP *)pBuf = hbmp;
}
- return TRUE;
+ return true;
}
bool wxBitmapDataObject::SetData(const wxDataFormat& format,
wxASSERT_MSG( m_bitmap.Ok(), wxT("pasting invalid bitmap") );
- return TRUE;
+ return true;
}
#endif // 0
// wxFileDataObject
// ----------------------------------------------------------------------------
-bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *pData)
+bool wxFileDataObject::SetData(size_t WXUNUSED(size),
+ const void *WXUNUSED_IN_WINCE(pData))
{
+#ifndef __WXWINCE__
m_filenames.Empty();
// the documentation states that the first member of DROPFILES structure is
// +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 ) {
}
}
- return TRUE;
+ return true;
+#else
+ return false;
+#endif
}
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
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
+bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
{
+#ifndef __WXWINCE__
// pData points to an externally allocated memory block
// created using the size returned by GetDataSize()
// if pData is NULL, or there are no files, return
if ( !pData || m_filenames.GetCount() == 0 )
- return FALSE;
+ return false;
// convert data pointer to a DROPFILES struct pointer
LPDROPFILES pDrop = (LPDROPFILES) pData;
{
// 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');
}
// add final null terminator
*pbuf = wxT('\0');
- return TRUE;
+ 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;
// CFSTR_SHELLURL is _always_ ANSI!
wxCharBuffer char_buffer( GetDataSize() );
wxCustomDataObject::GetDataHere( (void*)char_buffer.data() );
- wxString unicode_buffer( char_buffer );
+ wxString unicode_buffer( char_buffer, wxConvLibc );
memcpy( buffer, unicode_buffer.c_str(),
( unicode_buffer.length() + 1 ) * sizeof(wxChar) );
- return TRUE;
+ return true;
}
+ virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
+ void *buf) const
+ { return GetDataHere(buf); }
#endif
+
+ DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
};
size_t len = m_dataObjectLast->GetDataSize();
- m_dataObjectLast->GetDataHere(url.GetWriteBuf(len));
- 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)
-{
- wxASSERT_MSG( bitmap.Ok(), wxT("invalid bmp can't be converted to DIB") );
-
- // 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;
-}
-
-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;
-
- // biClrUsed has the number of colors, unless it's 0
- int numColors = pbmih->biClrUsed;
- if (numColors==0)
- {
- numColors = wxGetNumOfBitmapColors(pbmih->biBitCount);
- }
-
- // offset of image from the beginning of the header
- DWORD ofs = numColors * 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;
-}
-
#ifdef __WXDEBUG__
static const wxChar *GetTymedName(DWORD tymed)
#endif // Debug
#else // not using OLE at all
+
// ----------------------------------------------------------------------------
// wxDataObject
// ----------------------------------------------------------------------------
+#if wxUSE_DATAOBJ
+
wxDataObject::wxDataObject()
{
}
}
#ifdef __WXDEBUG__
-const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
+const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))
{
return NULL;
}
-#endif
+#endif // __WXDEBUG__
+
+#endif // wxUSE_DATAOBJ
+
+#endif // wxUSE_OLE/!wxUSE_OLE
-#endif
projects / wxWidgets.git / blobdiff