make methods available to all ports

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 4929160986a53a6d05e3d01ab98f532cab16e4d9..79250414207599d5a1f6b0cb42ca8e7ece49712f 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -24,6 +24,8 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

+#include "wx/textbuf.h"
+

 // ----------------------------------------------------------------------------
 // lists
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // lists
 // ----------------------------------------------------------------------------


@@ -94,21 +96,18 @@ wxDataObjectComposite::~wxDataObjectComposite()
 }
 
 wxDataObjectSimple *
 }
 
 wxDataObjectSimple *

-wxDataObjectComposite::GetObject(const wxDataFormat& format) const
+wxDataObjectComposite::GetObject(const wxDataFormat& format, wxDataObjectBase::Direction dir) const

 {
     wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst();
 {
     wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst();

+

     while ( node )
     {
         wxDataObjectSimple *dataObj = node->GetData();
 
     while ( node )
     {
         wxDataObjectSimple *dataObj = node->GetData();
 

-        if ( dataObj->GetFormat() == format )
-        {
-            return dataObj;
-        }
-
+        if (dataObj->IsSupported(format,dir))
+          return dataObj;

         node = node->GetNext();
     }
         node = node->GetNext();
     }

-

     return NULL;
 }
 
     return NULL;
 }
 


@@ -176,10 +175,18 @@ void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
 
 #endif
 
 
 #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,
 }
 
 void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,


@@ -190,8 +197,11 @@ void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
 
     for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
     {
 
     for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
     {

-      node->GetData()->GetAllFormats(formats+index,dir);
-      index += node->GetData()->GetFormatCount(dir);
+        // 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);

     }
 }
 
     }
 }
 


@@ -226,7 +236,12 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
                  wxT("unsupported format in wxDataObjectComposite"));
 
     m_receivedFormat = format;
                  wxT("unsupported format in wxDataObjectComposite"));
 
     m_receivedFormat = format;

-    return dataObj->SetData( len, buf );
+
+    // Notice that we must pass "format" here as wxTextDataObject, that we can
+    // have as one of our "simple" sub-objects actually is not that simple and
+    // can support multiple formats (ASCII/UTF-8/UTF-16/...) and so needs to
+    // know which one it is given.
+    return dataObj->SetData( format, len, buf );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -286,13 +301,14 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
 
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {
 
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {

+    const wxString& text = GetText();

     if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
     {
     if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
     {

-        return m_text.utf8_length();
+        return text.utf8_length();

     }
     else // wxDF_TEXT
     {
     }
     else // wxDF_TEXT
     {

-        const wxCharBuffer buf(wxConvLocal.cWC2MB(m_text.wc_str()));
+        const wxCharBuffer buf(wxConvLocal.cWC2MB(text.wc_str()));

         return buf ? strlen(buf) : 0;
     }
 }
         return buf ? strlen(buf) : 0;
     }
 }


@@ -302,13 +318,14 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
     if ( !buf )
         return false;
 
     if ( !buf )
         return false;
 

+    const wxString& text = GetText();

     if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
     {
     if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
     {

-        memcpy(buf, m_text.utf8_str(), m_text.utf8_length());
+        memcpy(buf, text.utf8_str(), text.utf8_length());

     }
     else // wxDF_TEXT
     {
     }
     else // wxDF_TEXT
     {

-        const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(m_text.wc_str()));
+        const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(text.wc_str()));

         if ( !bufLocal )
             return false;
 
         if ( !bufLocal )
             return false;
 


@@ -333,11 +350,11 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
         // 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
         // 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);
+        SetText(wxString::FromUTF8(buf, len));

     }
     else // wxDF_TEXT, convert from current (non-UTF8) locale
     {
     }
     else // wxDF_TEXT, convert from current (non-UTF8) locale
     {

-        m_text = wxConvLocal.cMB2WC(buf, len, NULL);
+        SetText(wxConvLocal.cMB2WC(buf, len, NULL));

     }
 
     return true;
     }
 
     return true;


@@ -347,22 +364,22 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
 
 #elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
 
 
 #elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
 

-static wxMBConvUTF16 sUTF16Converter;
+namespace
+{

 
 

-static inline wxMBConv& GetConv(const wxDataFormat& format)
+inline wxMBConv& GetConv(const wxDataFormat& format)

 {
 {

-    return
-        format == wxDF_UNICODETEXT
-        ? (wxMBConv&) sUTF16Converter
-        : (wxMBConv&) wxConvLocal;
+    static wxMBConvUTF16 s_UTF16Converter;
+
+    return format == wxDF_UNICODETEXT ? static_cast<wxMBConv&>(s_UTF16Converter)
+                                      : static_cast<wxMBConv&>(wxConvLocal);

 }
 
 }
 

+} // anonymous namespace
+

 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {

-    size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
-    len += (format == wxDF_UNICODETEXT ? 2 : 1);
-
-    return len;
+    return GetConv(format).WC2MB(NULL, GetText().wc_str(), 0);

 }
 
 bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 }
 
 bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const


@@ -370,53 +387,170 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
     if ( buf == NULL )
         return false;
 
     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);
+    wxCharBuffer buffer(GetConv(format).cWX2MB(GetText().c_str()));

 
 

-    // trailing (uni)char 0
-    memcpy( (char*)buf, (const char*)buffer, len );
+    memcpy(buf, buffer.data(), buffer.length());

 
     return true;
 }
 
 bool wxTextDataObject::SetData(const wxDataFormat& format,
 
     return true;
 }
 
 bool wxTextDataObject::SetData(const wxDataFormat& format,

-                               size_t WXUNUSED(len), const void *buf)
+                               size_t WXUNUSED(len),
+                               const void *buf)

 {
     if ( buf == NULL )
         return false;
 
 {
     if ( buf == NULL )
         return false;
 

-    wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
-
-    SetText( buffer );
+    SetText(GetConv(format).cMB2WX(static_cast<const char*>(buf)));

 
     return true;
 }
 
 #else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
 
 
     return true;
 }
 
 #else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
 

+// NB: This branch, using native wxChar for the clipboard, is only used under
+//     Windows currently. It's just a coincidence, but Windows is also the only
+//     platform where we need to convert the text to the native EOL format, so
+//     wxTextBuffer::Translate() is only used here and not in the code above.
+

 size_t wxTextDataObject::GetDataSize() const
 {
 size_t wxTextDataObject::GetDataSize() const
 {

-    return GetTextLength() * sizeof(wxChar);
+    return (wxTextBuffer::Translate(GetText()).length() + 1)*sizeof(wxChar);

 }
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {
 }
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {

-    wxStrcpy( (wxChar*)buf, GetText().c_str() );
+    const wxString textNative = wxTextBuffer::Translate(GetText());
+
+    // NOTE: use wxTmemcpy() instead of wxStrncpy() to allow
+    //       retrieval of strings with embedded NULLs
+    wxTmemcpy(static_cast<wxChar*>(buf),
+              textNative.t_str(),
+              textNative.length() + 1);

 
     return true;
 }
 
 
     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) );
+    const wxString
+        text = wxString(static_cast<const wxChar*>(buf), len/sizeof(wxChar));
+    SetText(wxTextBuffer::Translate(text, wxTextFileType_Unix));

 
     return true;
 }
 
 #endif // different wxTextDataObject implementations
 
 
     return true;
 }
 
 #endif // different wxTextDataObject implementations
 

+// ----------------------------------------------------------------------------
+// wxHTMLDataObject
+// ----------------------------------------------------------------------------
+
+size_t wxHTMLDataObject::GetDataSize() const
+{
+    const wxScopedCharBuffer buffer(GetHTML().utf8_str());
+
+    size_t size = buffer.length();
+
+#ifdef __WXMSW__
+    // On Windows we need to add some stuff to the string to satisfy
+    // its clipboard format requirements.
+    size += 400;
+#endif
+
+    return size;
+}
+
+bool wxHTMLDataObject::GetDataHere(void *buf) const
+{
+    if ( !buf )
+        return false;
+
+    // Windows and Mac always use UTF-8, and docs suggest GTK does as well.
+    const wxScopedCharBuffer html(GetHTML().utf8_str());
+    if ( !html )
+        return false;
+
+    char* const buffer = static_cast<char*>(buf);
+
+#ifdef __WXMSW__
+    // add the extra info that the MSW clipboard format requires.
+
+        // Create a template string for the HTML header...
+    strcpy(buffer,
+        "Version:0.9\r\n"
+        "StartHTML:00000000\r\n"
+        "EndHTML:00000000\r\n"
+        "StartFragment:00000000\r\n"
+        "EndFragment:00000000\r\n"
+        "<html><body>\r\n"
+        "<!--StartFragment -->\r\n");
+
+    // Append the HTML...
+    strcat(buffer, html);
+    strcat(buffer, "\r\n");
+    // Finish up the HTML format...
+    strcat(buffer,
+        "<!--EndFragment-->\r\n"
+        "</body>\r\n"
+        "</html>");
+
+    // Now go back, calculate all the lengths, and write out the
+    // necessary header information. Note, wsprintf() truncates the
+    // string when you overwrite it so you follow up with code to replace
+    // the 0 appended at the end with a '\r'...
+    char *ptr = strstr(buffer, "StartHTML");
+    sprintf(ptr+10, "%08u", (unsigned)(strstr(buffer, "<html>") - buffer));
+    *(ptr+10+8) = '\r';
+
+    ptr = strstr(buffer, "EndHTML");
+    sprintf(ptr+8, "%08u", (unsigned)strlen(buffer));
+    *(ptr+8+8) = '\r';
+
+    ptr = strstr(buffer, "StartFragment");
+    sprintf(ptr+14, "%08u", (unsigned)(strstr(buffer, "<!--StartFrag") - buffer));
+    *(ptr+14+8) = '\r';
+
+    ptr = strstr(buffer, "EndFragment");
+    sprintf(ptr+12, "%08u", (unsigned)(strstr(buffer, "<!--EndFrag") - buffer));
+    *(ptr+12+8) = '\r';
+#else
+    strcpy(buffer, html);
+#endif // __WXMSW__
+
+    return true;
+}
+
+bool wxHTMLDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+{
+    if ( buf == NULL )
+        return false;
+
+    // Windows and Mac always use UTF-8, and docs suggest GTK does as well.
+    wxString html = wxString::FromUTF8(static_cast<const char*>(buf));
+
+#ifdef __WXMSW__
+    // To be consistent with other platforms, we only add the Fragment part
+    // of the Windows HTML clipboard format to the data object.
+    int fragmentStart = html.rfind("StartFragment");
+    int fragmentEnd = html.rfind("EndFragment");
+
+    if (fragmentStart != wxNOT_FOUND && fragmentEnd != wxNOT_FOUND)
+    {
+        int startCommentEnd = html.find("-->", fragmentStart) + 3;
+        int endCommentStart = html.rfind("<!--", fragmentEnd);
+
+        if (startCommentEnd != wxNOT_FOUND && endCommentStart != wxNOT_FOUND)
+            html = html.Mid(startCommentEnd, endCommentStart - startCommentEnd);
+    }
+#endif // __WXMSW__
+
+    SetHTML( html );
+
+    return true;
+}
+
+

 // ----------------------------------------------------------------------------
 // wxCustomDataObject
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxCustomDataObject
 // ----------------------------------------------------------------------------