// Created: 19.10.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows Team
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dataobjbase.h"
#endif
wxDataObjectComposite::wxDataObjectComposite()
{
m_preferred = 0;
+}
- m_dataObjects.DeleteContents(TRUE);
+wxDataObjectComposite::~wxDataObjectComposite()
+{
+ WX_CLEAR_LIST(wxSimpleDataObjectList, m_dataObjects);
}
wxDataObjectSimple *
wxDataObjectComposite::GetObject(const wxDataFormat& format) const
{
- wxSimpleDataObjectList::Node *node = m_dataObjects.GetFirst();
+ wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst();
while ( node )
{
wxDataObjectSimple *dataObj = node->GetData();
wxDataFormat
wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
{
- wxSimpleDataObjectList::Node *node = m_dataObjects.Item( m_preferred );
+ wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.Item( m_preferred );
wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") );
{
wxDataObjectSimple *dataObj = GetObject(format);
- wxCHECK_MSG( dataObj, FALSE,
+ wxCHECK_MSG( dataObj, 0,
wxT("unsupported format in wxDataObjectComposite"));
return dataObj->GetBufferOffset( format );
}
+
const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
size_t* size,
const wxDataFormat& format )
{
wxDataObjectSimple *dataObj = GetObject(format);
- wxCHECK_MSG( dataObj, FALSE,
+ wxCHECK_MSG( dataObj, NULL,
wxT("unsupported format in wxDataObjectComposite"));
return dataObj->GetSizeFromBuffer( buffer, size, format );
}
+
void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
const wxDataFormat& format )
{
wxDataObjectSimple *dataObj = GetObject(format);
- wxCHECK_MSG( dataObj, FALSE,
+ wxCHECK_MSG( dataObj, NULL,
wxT("unsupported format in wxDataObjectComposite"));
return dataObj->SetSizeInBuffer( buffer, size, format );
Direction WXUNUSED(dir)) const
{
size_t n = 0;
- wxSimpleDataObjectList::Node *node;
+ wxSimpleDataObjectList::compatibility_iterator node;
for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
{
// TODO if ( !outputOnlyToo ) && this one counts ...
// wxTextDataObject
// ----------------------------------------------------------------------------
+#if defined(__WXGTK20__) && wxUSE_UNICODE
+
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
+{
+ if (format == wxDF_UNICODETEXT)
+ {
+ // Use UTF8 not UCS4
+ wxCharBuffer buffer = wxConvUTF8.cWX2MB( GetText().c_str() );
+ return strlen( (const char*) buffer ) + 1;
+ }
+ else // == wxDF_TEXT
+ {
+ wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );
+ return strlen( (const char*) buffer ) + 1;
+ }
+}
+
+bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+{
+ if (format == wxDF_UNICODETEXT)
+ {
+ // Use UTF8 not UCS4
+ wxCharBuffer buffer = wxConvUTF8.cWX2MB( GetText().c_str() );
+ strcpy( (char*) buf, (const char*) buffer );
+ }
+ else
+ {
+ wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );
+ strcpy( (char*) buf, (const char*) buffer );
+ }
+
+ return TRUE;
+}
+
+bool wxTextDataObject::SetData(const wxDataFormat& format,
+ size_t WXUNUSED(len), const void *buf)
+{
+ if (format == wxDF_UNICODETEXT)
+ SetText( wxConvUTF8.cMB2WX( (const char*) buf ) );
+ else
+ SetText( wxConvLibc.cMB2WX( (const char*) buf ) );
+
+ return TRUE;
+}
+
+#else
+
size_t wxTextDataObject::GetDataSize() const
{
return GetTextLength() * sizeof(wxChar);
return TRUE;
}
+#endif
+
// ----------------------------------------------------------------------------
// wxFileDataObjectBase
// ----------------------------------------------------------------------------