Fix the off-by-one a little differently, and correct a refresh problem

[wxWidgets.git] / src / gtk1 / dataobj.cpp

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 3da4095b2b4c832c78c59b7bce6b7f6cfe465d73..84b89dbef67dc7f02fe9bd85d98c6fb2b379df99 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -202,8 +202,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {

+        filenames += wxT("file:");

         filenames += m_filenames[i];
         filenames += m_filenames[i];

-        filenames += (wxChar) 0;
+        filenames += wxT("\r\n");

     }
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
     }
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );


@@ -217,8 +218,9 @@ size_t wxFileDataObject::GetDataSize() const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {

+        // This is junk in UTF-8

         res += m_filenames[i].Len();
         res += m_filenames[i].Len();

-        res += 1;
+        res += 5 + 2; // "file:" (5) + "\r\n" (2)

     }
 
     return res + 1;
     }
 
     return res + 1;