X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/dobjcmn.cpp

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index dad4e0c8aa..a37ffa50e6 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     19.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets Team
-// Licence:     wxWidgets licence
+// 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);
@@ -239,47 +239,39 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
 
 #if defined(__WXGTK20__) && wxUSE_UNICODE
 
+static inline wxMBConv& GetConv(const wxDataFormat& format)
+{
+    // use UTF8 for wxDF_UNICODETEXT and UCS4 for wxDF_TEXT
+    return format == wxDF_UNICODETEXT ? wxConvUTF8 : wxConvLibc;
+}
+
 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;
-    }
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    return buffer ? strlen(buffer) + 1 : 0;
 }
 
 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;
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    if ( !buffer )
+        return false;
+
+    strcpy( (char*) buf, 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;
+    wxWCharBuffer buffer = GetConv(format).cMB2WX((const char *)buf);
+    if ( !buffer )
+        return false;
+
+    SetText(buffer);
+
+    return true;
 }
 
 #elif wxUSE_UNICODE && defined(__WXMAC__)
@@ -289,9 +281,8 @@ size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
     if (format == wxDF_UNICODETEXT)
     {
         // host native is UTF16
-	    wxMBConvUTF16BE converter ;
-        wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() );
-        return strlen( (const char*) buffer ) + 1;
+        wxMBConvUTF16 converter ;
+        return converter.WC2MB( NULL , GetText().c_str() , 0 ) + 2; // add space for trailing unichar 0
     }
     else  // == wxDF_TEXT
     {
@@ -305,17 +296,18 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
     if (format == wxDF_UNICODETEXT)
     {
         // host native is UTF16
-	    wxMBConvUTF16BE converter ;
+        wxMBConvUTF16 converter ;
+        size_t len = converter.WC2MB( NULL , GetText().c_str() , 0 ) ;
         wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() );
-        strcpy( (char*) buf, (const char*) buffer );
+        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;
+
+    return true;
 }
 
 bool wxTextDataObject::SetData(const wxDataFormat& format,
@@ -324,13 +316,13 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
     if (format == wxDF_UNICODETEXT)
     {
         // host native is UTF16
-	    wxMBConvUTF16BE converter ;
+        wxMBConvUTF16 converter ;
         SetText( converter.cMB2WX( (const char*) buf ) );
     }
     else
         SetText( wxConvLibc.cMB2WX( (const char*) buf ) );
- 
-    return TRUE;
+
+    return true;
 }
 
 #else
@@ -344,14 +336,14 @@ bool wxTextDataObject::GetDataHere(void *buf) const
 {
     wxStrcpy((wxChar *)buf, GetText().c_str());
 
-    return TRUE;
+    return true;
 }
 
 bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 {
     SetText(wxString((const wxChar *)buf));
 
-    return TRUE;
+    return true;
 }
 
 #endif
@@ -447,11 +439,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)
@@ -460,11 +452,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;
 }
 
 // ============================================================================