X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..3b01b1fe4cb656f39290bf7f3891667855abe601:/src/common/dobjcmn.cpp?ds=sidebyside

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 55c16a3749..483eab6d59 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows Team
+// Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -215,7 +215,7 @@ bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format,
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 
-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, false,
                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->GetDataHere(buf);
@@ -227,7 +227,7 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 
-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, false,
                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->SetData(len, buf);
@@ -237,42 +237,125 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
 // wxTextDataObject
 // ----------------------------------------------------------------------------
 
-size_t wxTextDataObject::GetDataSize() const
-{
 #if defined(__WXGTK20__) && wxUSE_UNICODE
-    // Use UTF8 not UCS4
-    wxCharBuffer buffer = wxConvUTF8.cWX2MB( GetText().c_str() );
-    return strlen( (const char*) buffer ) + 1;
+
+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;
+}
+
+#elif wxUSE_UNICODE && defined(__WXMAC__)
+
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
+{
+    if (format == wxDF_UNICODETEXT)
+    {
+        // host native is UTF16
+        wxMBConvUTF16BE converter ;
+        return converter.WC2MB( NULL , GetText().c_str() , 0 ) + 2; // add space for trailing unichar 0
+    }
+    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)
+    {
+        // host native is UTF16
+        wxMBConvUTF16BE 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
+    }
+    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)
+    {
+        // host native is UTF16
+        wxMBConvUTF16BE converter ;
+        SetText( converter.cMB2WX( (const char*) buf ) );
+    }
+    else
+        SetText( wxConvLibc.cMB2WX( (const char*) buf ) );
+
+    return true;
+}
+
 #else
+
+size_t wxTextDataObject::GetDataSize() const
+{
     return GetTextLength() * sizeof(wxChar);
-#endif
 }
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-    // Use UTF8 not UCS4
-    wxCharBuffer buffer = wxConvUTF8.cWX2MB( GetText().c_str() );
-    strcpy( (char*) buf, (const char*) buffer );
-#else
     wxStrcpy((wxChar *)buf, GetText().c_str());
-#endif
 
-    return TRUE;
+    return true;
 }
 
 bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 {
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-    // Use UTF8 not UCS4
-    SetText( wxConvUTF8.cMB2WX( (const char*) buf ) );
-#else
     SetText(wxString((const wxChar *)buf));
-#endif
 
-    return TRUE;
+    return true;
 }
 
+#endif
+
 // ----------------------------------------------------------------------------
 // wxFileDataObjectBase
 // ----------------------------------------------------------------------------
@@ -364,11 +447,11 @@ bool wxCustomDataObject::GetDataHere(void *buf) const
 {
     void *data = GetData();
     if ( !data )
-        return FALSE;
+        return false;
 
     memcpy(buf, data, GetSize());
 
-    return TRUE;
+    return true;
 }
 
 bool wxCustomDataObject::SetData(size_t size, const void *buf)
@@ -377,11 +460,11 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf)
 
     m_data = Alloc(size);
     if ( !m_data )
-        return FALSE;
+        return false;
 
     memcpy(m_data, buf, m_size = size);
 
-    return TRUE;
+    return true;
 }
 
 // ============================================================================