Forgot this

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index dd27a6032d7f2d2b42d66786d55054fbb6b805ed..df021af849a3669ca8404e22c730b61e720c4e65 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -18,13 +18,12 @@
 
 #if wxUSE_DATAOBJ
 
+#include "wx/dataobj.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/debug.h"
 #endif
 
-#include "wx/dataobj.h"
-
 // ----------------------------------------------------------------------------
 // lists
 // ----------------------------------------------------------------------------
@@ -86,6 +85,7 @@ bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
 wxDataObjectComposite::wxDataObjectComposite()
 {
     m_preferred = 0;
+    m_receivedFormat = wxFormatInvalid;
 }
 
 wxDataObjectComposite::~wxDataObjectComposite()
@@ -109,7 +109,7 @@ wxDataObjectComposite::GetObject(const wxDataFormat& format) const
         node = node->GetNext();
     }
 
-    return (wxDataObjectSimple *)NULL;
+    return NULL;
 }
 
 void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
@@ -120,6 +120,11 @@ 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
 {
@@ -219,6 +224,7 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
     wxCHECK_MSG( dataObj, false,
                  wxT("unsupported format in wxDataObjectComposite"));
 
+    m_receivedFormat = format;
     return dataObj->SetData( len, buf );
 }
 
@@ -226,7 +232,13 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
 // 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)
 {
@@ -238,17 +250,20 @@ 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 == NULL )
+    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;
 }
@@ -266,7 +281,70 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
     return true;
 }
 
-#elif wxUSE_UNICODE && defined(__WXMAC__)
+#else // wxUSE_UNICODE_UTF8
+
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
+{
+    if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
+    {
+        return m_text.utf8_length();
+    }
+    else // wxDF_TEXT
+    {
+        const wxCharBuffer buf(wxConvLocal.cWC2MB(m_text.wc_str()));
+        return buf ? strlen(buf) : 0;
+    }
+}
+
+bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+{
+    if ( !buf )
+        return false;
+
+    if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
+    {
+        memcpy(buf, m_text.utf8_str(), m_text.utf8_length());
+    }
+    else // wxDF_TEXT
+    {
+        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 len, const void *buf_)
+{
+    const char * const buf = static_cast<const char *>(buf_);
+
+    if ( buf == NULL )
+        return false;
+
+    if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
+    {
+        // 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);
+    }
+
+    return true;
+}
+
+#endif // wxUSE_UNICODE_WCHAR/wxUSE_UNICODE_UTF8
+
+#elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
 
 static wxMBConvUTF16 sUTF16Converter;
 
@@ -315,7 +393,7 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
     return true;
 }
 
-#else
+#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
 
 size_t wxTextDataObject::GetDataSize() const
 {
@@ -336,54 +414,7 @@ bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
     return true;
 }
 
-#endif
-
-// ----------------------------------------------------------------------------
-// wxFileDataObjectBase
-// ----------------------------------------------------------------------------
-
-// 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
-
-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 str;
-}
-
-void wxFileDataObjectBase::SetFilenames(const wxChar* filenames)
-{
-    m_filenames.Empty();
-
-    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;
-            }
-
-            m_filenames.Add(current);
-            current.Empty();
-        }
-    }
-}
-
-#endif
+#endif // different wxTextDataObject implementations
 
 // ----------------------------------------------------------------------------
 // wxCustomDataObject
@@ -418,7 +449,7 @@ void wxCustomDataObject::Free()
 {
     delete [] (char*)m_data;
     m_size = 0;
-    m_data = (void*)NULL;
+    m_data = NULL;
 }
 
 size_t wxCustomDataObject::GetDataSize() const