///////////////////////////////////////////////////////////////////////////////
-// Name: common/dobjcmn.cpp
+// Name: src/common/dobjcmn.cpp
// Purpose: implementation of data object methods common to all platforms
// Author: Vadim Zeitlin, Robert Roebling
// Modified by:
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "dataobjbase.h"
-#endif
-
+// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#if wxUSE_DATAOBJ
+#include "wx/dataobj.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/debug.h"
-#endif // WX_PRECOMP
-
-#include "wx/dataobj.h"
+#endif
// ----------------------------------------------------------------------------
// lists
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxSimpleDataObjectList);
+WX_DEFINE_LIST(wxSimpleDataObjectList)
// ----------------------------------------------------------------------------
// globals
bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
Direction dir) const
{
- size_t nFormatCount = GetFormatCount(dir);
+ size_t nFormatCount = GetFormatCount( dir );
if ( nFormatCount == 1 )
{
- return format == GetPreferredFormat(dir);
+ return format == GetPreferredFormat( dir );
}
else
{
wxDataFormat *formats = new wxDataFormat[nFormatCount];
- GetAllFormats(formats, dir);
+ GetAllFormats( formats, dir );
size_t n;
for ( n = 0; n < nFormatCount; n++ )
wxDataObjectComposite::wxDataObjectComposite()
{
m_preferred = 0;
+ m_receivedFormat = wxFormatInvalid;
}
wxDataObjectComposite::~wxDataObjectComposite()
{
- WX_CLEAR_LIST(wxSimpleDataObjectList, m_dataObjects);
+ WX_CLEAR_LIST( wxSimpleDataObjectList, m_dataObjects );
}
wxDataObjectSimple *
node = node->GetNext();
}
- return (wxDataObjectSimple *)NULL;
+ return NULL;
}
void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
m_dataObjects.Append( dataObject );
}
+wxDataFormat wxDataObjectComposite::GetReceivedFormat() const
+{
+ return m_receivedFormat;
+}
+
wxDataFormat
wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
{
void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
const wxDataFormat& format )
{
- wxDataObjectSimple *dataObj = GetObject(format);
+ wxDataObjectSimple *dataObj = GetObject( format );
wxCHECK_MSG( dataObj, NULL,
wxT("unsupported format in wxDataObjectComposite"));
bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format,
void *buf) const
{
- wxDataObjectSimple *dataObj = GetObject(format);
+ wxDataObjectSimple *dataObj = GetObject( format );
wxCHECK_MSG( dataObj, false,
wxT("unsupported format in wxDataObjectComposite"));
- return dataObj->GetDataHere(buf);
+ return dataObj->GetDataHere( buf );
}
bool wxDataObjectComposite::SetData(const wxDataFormat& format,
size_t len,
const void *buf)
{
- wxDataObjectSimple *dataObj = GetObject(format);
+ wxDataObjectSimple *dataObj = GetObject( format );
wxCHECK_MSG( dataObj, false,
wxT("unsupported format in wxDataObjectComposite"));
- return dataObj->SetData(len, buf);
+ m_receivedFormat = format;
+ return dataObj->SetData( len, buf );
}
// ----------------------------------------------------------------------------
// wxTextDataObject
// ----------------------------------------------------------------------------
-#if defined(__WXGTK20__) && wxUSE_UNICODE
+#ifdef wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
+
+// FIXME-UTF8: we should be able to merge wchar_t and UTF-8 versions once we
+// have a way to get UTF-8 string (and its length) in both builds
+// without loss of efficiency (i.e. extra buffer copy/strlen call)
+
+#if wxUSE_UNICODE_WCHAR
static inline wxMBConv& GetConv(const wxDataFormat& format)
{
size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
{
wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
- return buffer ? strlen(buffer) + 1 : 0;
+
+ return buffer ? strlen( buffer ) : 0;
}
bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
{
+ if ( !buf )
+ return false;
+
wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
if ( !buffer )
return false;
- strcpy( (char*) buf, buffer );
+ memcpy( (char*) buf, buffer, GetDataSize(format) );
+ // strcpy( (char*) buf, buffer );
return true;
}
bool wxTextDataObject::SetData(const wxDataFormat& format,
size_t WXUNUSED(len), const void *buf)
{
- wxWCharBuffer buffer = GetConv(format).cMB2WX((const char *)buf);
- if ( !buffer )
+ if ( buf == NULL )
return false;
- SetText(buffer);
+ wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
+
+ SetText( buffer );
return true;
}
-#elif wxUSE_UNICODE && defined(__WXMAC__)
+#else // wxUSE_UNICODE_UTF8
size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
{
- if (format == wxDF_UNICODETEXT)
+ if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
{
- // host native is UTF16
- wxMBConvUTF16 converter ;
- return converter.WC2MB( NULL , GetText().c_str() , 0 ) + 2; // add space for trailing unichar 0
+ return m_text.utf8_length();
}
- else // == wxDF_TEXT
+ else // wxDF_TEXT
{
- wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );
- // in some cases "buffer" is null (e.g. Mac OS X)
- return buffer ? strlen( (const char*) buffer ) + 1 : 0;
+ const wxCharBuffer buf(wxConvLocal.cWC2MB(m_text.wc_str()));
+ return buf ? strlen(buf) : 0;
}
}
bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
{
- if (format == wxDF_UNICODETEXT)
+ if ( !buf )
+ return false;
+
+ if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
{
- // host native is UTF16
- wxMBConvUTF16 converter ;
- size_t len = converter.WC2MB( NULL , GetText().c_str() , 0 ) ;
- wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() );
- memcpy( (char*) buf, (const char*) buffer , len + 2); // trailing unichar 0
+ memcpy(buf, m_text.utf8_str(), m_text.utf8_length());
}
- else
+ else // wxDF_TEXT
{
- wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );
- // in some cases "buffer" is null (e.g. Mac OS X)
- if (buffer)
- strcpy( (char*) buf, (const char*) buffer );
+ const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(m_text.wc_str()));
+ if ( !bufLocal )
+ return false;
+
+ memcpy(buf, bufLocal, strlen(bufLocal));
}
return true;
}
bool wxTextDataObject::SetData(const wxDataFormat& format,
- size_t WXUNUSED(len), const void *buf)
+ size_t len, const void *buf_)
{
- if (format == wxDF_UNICODETEXT)
+ const char * const buf = static_cast<const char *>(buf_);
+
+ if ( buf == NULL )
+ return false;
+
+ if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
{
- // host native is UTF16
- wxMBConvUTF16 converter ;
- SetText( converter.cMB2WX( (const char*) buf ) );
+ // normally the data is in UTF-8 so we could use FromUTF8Unchecked()
+ // but it's not absolutely clear what GTK+ does if the clipboard data
+ // is not in UTF-8 so do an extra check for tranquility, it shouldn't
+ // matter much if we lose a bit of performance when pasting from
+ // clipboard
+ m_text = wxString::FromUTF8(buf, len);
+ }
+ else // wxDF_TEXT, convert from current (non-UTF8) locale
+ {
+ m_text = wxConvLocal.cMB2WC(buf, len, NULL);
}
- else
- SetText( wxConvLibc.cMB2WX( (const char*) buf ) );
return true;
}
-#else
+#endif // wxUSE_UNICODE_WCHAR/wxUSE_UNICODE_UTF8
-size_t wxTextDataObject::GetDataSize() const
+#elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
+
+static wxMBConvUTF16 sUTF16Converter;
+
+static inline wxMBConv& GetConv(const wxDataFormat& format)
{
- return GetTextLength() * sizeof(wxChar);
+ return
+ format == wxDF_UNICODETEXT
+ ? (wxMBConv&) sUTF16Converter
+ : (wxMBConv&) wxConvLocal;
}
-bool wxTextDataObject::GetDataHere(void *buf) const
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
{
- wxStrcpy((wxChar *)buf, GetText().c_str());
+ size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
+ len += (format == wxDF_UNICODETEXT ? 2 : 1);
- return true;
+ return len;
}
-bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
{
- SetText(wxString((const wxChar *)buf));
+ if ( buf == NULL )
+ return false;
+
+ wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+
+ size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
+ len += (format == wxDF_UNICODETEXT ? 2 : 1);
+
+ // trailing (uni)char 0
+ memcpy( (char*)buf, (const char*)buffer, len );
return true;
}
-#endif
+bool wxTextDataObject::SetData(const wxDataFormat& format,
+ size_t WXUNUSED(len), const void *buf)
+{
+ if ( buf == NULL )
+ return false;
-// ----------------------------------------------------------------------------
-// wxFileDataObjectBase
-// ----------------------------------------------------------------------------
+ wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
-// VZ: I don't need this in MSW finally, so if it is needed in wxGTK, it should
-// be moved to gtk/dataobj.cpp
-#if 0
+ SetText( buffer );
-wxString wxFileDataObjectBase::GetFilenames() const
-{
- wxString str;
- size_t count = m_filenames.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- str << m_filenames[n] << wxT('\0');
- }
+ return true;
+}
+
+#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
- return str;
+size_t wxTextDataObject::GetDataSize() const
+{
+ return GetTextLength() * sizeof(wxChar);
}
-void wxFileDataObjectBase::SetFilenames(const wxChar* filenames)
+bool wxTextDataObject::GetDataHere(void *buf) const
{
- m_filenames.Empty();
+ wxStrcpy( (wxChar*)buf, GetText().c_str() );
- wxString current;
- for ( const wxChar *pc = filenames; ; pc++ )
- {
- if ( *pc )
- {
- current += *pc;
- }
- else
- {
- if ( !current )
- {
- // 2 consecutive NULs - this is the end of the string
- break;
- }
+ return true;
+}
- m_filenames.Add(current);
- current.Empty();
- }
- }
+bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+{
+ SetText( wxString((const wxChar*)buf) );
+
+ return true;
}
-#endif // 0
+#endif // different wxTextDataObject implementations
// ----------------------------------------------------------------------------
// wxCustomDataObject
wxCustomDataObject::wxCustomDataObject(const wxDataFormat& format)
: wxDataObjectSimple(format)
{
- m_data = (void *)NULL;
+ m_data = NULL;
+ m_size = 0;
}
wxCustomDataObject::~wxCustomDataObject()
void wxCustomDataObject::Free()
{
- delete [] (char *)m_data;
+ delete [] (char*)m_data;
m_size = 0;
- m_data = (void *)NULL;
+ m_data = NULL;
}
size_t wxCustomDataObject::GetDataSize() const
bool wxCustomDataObject::GetDataHere(void *buf) const
{
+ if ( buf == NULL )
+ return false;
+
void *data = GetData();
- if ( !data )
+ if ( data == NULL )
return false;
- memcpy(buf, data, GetSize());
+ memcpy( buf, data, GetSize() );
return true;
}
Free();
m_data = Alloc(size);
- if ( !m_data )
+ if ( m_data == NULL )
return false;
- memcpy(m_data, buf, m_size = size);
+ m_size = size;
+ memcpy( m_data, buf, m_size );
return true;
}
return wxDragNone;
wxTextDataObject *dobj = (wxTextDataObject *)m_dataObject;
- return OnDropText(x, y, dobj->GetText()) ? def : wxDragNone;
+ return OnDropText( x, y, dobj->GetText() ) ? def : wxDragNone;
}
// ----------------------------------------------------------------------------
return wxDragNone;
wxFileDataObject *dobj = (wxFileDataObject *)m_dataObject;
- return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone;
+ return OnDropFiles( x, y, dobj->GetFilenames() ) ? def : wxDragNone;
}
#endif // wxUSE_DRAG_AND_DROP
projects / wxWidgets.git / blobdiff