diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 10ba0a267a..2c48b383fc 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -394,13 +394,13 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 }
 
 bool wxTextDataObject::SetData(const wxDataFormat& format,
-                               size_t WXUNUSED(len),
+                               size_t len,
                                const void *buf)
 {
     if ( buf == NULL )
         return false;
 
-    SetText(GetConv(format).cMB2WX(static_cast<const char*>(buf)));
+    SetText(GetConv(format).cMB2WC(static_cast<const char*>(buf), len, NULL));
 
     return true;
 }