// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dataobj.h"
#endif
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; }
+ void SetDeleteFlag() { m_mustDelete = true; }
DECLARE_IUNKNOWN_METHODS;
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 )
{
wxIDataObject::wxIDataObject(wxDataObject *pDataObject)
{
m_pDataObject = pDataObject;
- m_mustDelete = FALSE;
+ m_mustDelete = false;
}
wxIDataObject::~wxIDataObject()
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__) )
// we suppose that the size precedes the data
pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format );
if (! format.IsStandard() ) {
- // see GetData for coresponding increment
+ // see GetData for corresponding increment
size -= m_pDataObject->GetBufferOffset( 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");
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
{
-#if wxUSE_WXDIB
+#if wxUSE_WXDIB && !defined(__WXWINCE__)
return wxDIB::ConvertFromBitmap(NULL, GetHbitmapOf(GetBitmap()));
#else
return 0;
bool wxBitmapDataObject::GetDataHere(void *buf) const
{
-#if wxUSE_WXDIB
+#if wxUSE_WXDIB && !defined(__WXWINCE__)
BITMAPINFO * const pbi = (BITMAPINFO *)buf;
return wxDIB::ConvertFromBitmap(pbi, GetHbitmapOf(GetBitmap())) != 0;
#else
- return FALSE;
+ wxUnusedVar(buf);
+ return false;
#endif
}
bool wxBitmapDataObject::SetData(size_t WXUNUSED(len), const void *buf)
{
-#if wxUSE_WXDIB
+#if wxUSE_WXDIB && !defined(__WXWINCE__)
const BITMAPINFO * const pbmi = (const BITMAPINFO *)buf;
HBITMAP hbmp = wxDIB::ConvertToBitmap(pbmi);
SetBitmap(bitmap);
- return TRUE;
+ return true;
#else
- return FALSE;
+ 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
// +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;
+ wxUnusedVar(pData);
+ return false;
#endif
}
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;
// 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;
+ wxUnusedVar(pData);
+ return false;
#endif
}
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;
}
#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