special casing mac code

[wxWidgets.git] / src / common / dobjcmn.cpp

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 02786e98cd3363c82b2b71b5aed9d6c1386f024b..9f6f29d84e33b914ac0663d8bab173e0c7da1cd2 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -94,29 +94,48 @@ wxDataObjectComposite::~wxDataObjectComposite()
 }
 
 wxDataObjectSimple *
-wxDataObjectComposite::GetObject(const wxDataFormat& format) const
+wxDataObjectComposite::GetObject(const wxDataFormat& format, wxDataObjectBase::Direction dir) const
 {
     wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst();
+
     while ( node )
     {
         wxDataObjectSimple *dataObj = node->GetData();
 
-        if ( dataObj->GetFormat() == format )
-        {
-            return dataObj;
-        }
-
+        if (dataObj->IsSupported(format,dir))
+          return dataObj;
         node = node->GetNext();
     }
-
-    return (wxDataObjectSimple *)NULL;
+    return NULL;
 }
 
 void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
 {
+   // check if the data format of the passed object already exists in the composite data object, if this is the case
+   // do not add the data object and display a message in debug mode (otherwise this method fails silently):
+   // start checking if the data format exists for the 'GET' direction:
+    size_t indexFormats;
+    size_t noOfFormats;
+    wxDataFormat* formats;
+
+    noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Get);
+    formats = new wxDataFormat[noOfFormats];
+    for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)
+      wxCHECK_RET(this->GetObject(formats[indexFormats],wxDataObjectBase::Get) == NULL,
+                  _("The data format for the GET-direction of the to be added data object already exists"));
+    delete[] formats;
+   // do the same with the 'SET' direction:
+    noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Set);
+
+    formats = new wxDataFormat[noOfFormats];
+    for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)
+      wxCHECK_RET(this->GetObject(formats[indexFormats],wxDataObjectBase::Set) == NULL,
+                  _("The data format for the SET-direction of the to be added data object already exists"));
+    delete[] formats;
+
+   // if we reach this location the data object can simply be appended:
     if ( preferred )
         m_preferred = m_dataObjects.GetCount();
-
     m_dataObjects.Append( dataObject );
 }
 
@@ -176,21 +195,33 @@ void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
 
 #endif
 
-size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const
+size_t wxDataObjectComposite::GetFormatCount(Direction dir) const
 {
-    // TODO what about the Get/Set only formats?
-    return m_dataObjects.GetCount();
+    size_t n = 0;
+
+    // NOTE: some wxDataObjectSimple objects may return a number greater than 1
+    //       from GetFormatCount(): this is the case of e.g. wxTextDataObject
+    //       under wxMac and wxGTK
+    wxSimpleDataObjectList::compatibility_iterator node;
+    for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
+        n += node->GetData()->GetFormatCount(dir);
+
+    return n;
 }
 
 void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
-                                          Direction WXUNUSED(dir)) const
+                                          Direction dir) const
 {
-    size_t n = 0;
+    size_t index(0);
     wxSimpleDataObjectList::compatibility_iterator node;
+
     for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
     {
-        // TODO if ( !outputOnlyToo ) && this one counts ...
-        formats[n++] = node->GetData()->GetFormat();
+        // NOTE: some wxDataObjectSimple objects may return more than 1 format
+        //       from GetAllFormats(): this is the case of e.g. wxTextDataObject
+        //       under wxMac and wxGTK
+        node->GetData()->GetAllFormats(formats+index, dir);
+        index += node->GetData()->GetFormatCount(dir);
     }
 }
 
@@ -320,7 +351,7 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 bool wxTextDataObject::SetData(const wxDataFormat& format,
                                size_t len, const void *buf_)
 {
-    const char * const buf = wx_static_cast(const char *, buf_);
+    const char * const buf = static_cast<const char *>(buf_);
 
     if ( buf == NULL )
         return false;
@@ -402,14 +433,16 @@ size_t wxTextDataObject::GetDataSize() const
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {
-    wxStrcpy( (wxChar*)buf, GetText().c_str() );
+    // NOTE: use wxTmemcpy() instead of wxStrncpy() to allow
+    //       retrieval of strings with embedded NULLs
+    wxTmemcpy( (wxChar*)buf, GetText().c_str(), GetTextLength() );
 
     return true;
 }
 
-bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+bool wxTextDataObject::SetData(size_t len, const void *buf)
 {
-    SetText( wxString((const wxChar*)buf) );
+    SetText( wxString((const wxChar*)buf, len/sizeof(wxChar)) );
 
     return true;
 }
@@ -449,7 +482,7 @@ void wxCustomDataObject::Free()
 {
     delete [] (char*)m_data;
     m_size = 0;
-    m_data = (void*)NULL;
+    m_data = NULL;
 }
 
 size_t wxCustomDataObject::GetDataSize() const