adding scroll wheel support

[wxWidgets.git] / src / msw / ole / dataobj.cpp

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 3831f98b1a266b1de2a0129efadee21dd8986fa5..ff9169dbe59035158d104a6273762b8a4a8ac12a 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -686,13 +686,14 @@ size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )
     return NeedsVerbatimData(format) ? 0 : sizeof(size_t);
 }
 
     return NeedsVerbatimData(format) ? 0 : sizeof(size_t);
 }
 

-const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
-                                               const wxDataFormat& format )
+const void *wxDataObject::GetSizeFromBuffer(const void *buffer,
+                                            size_t *size,
+                                            const wxDataFormat& WXUNUSED(format))

 {
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const
 {
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const

-    size_t realsz = ::HeapSize(::GetProcessHeap(), 0,
-                               wx_const_cast(void*, buffer));
+    const size_t realsz = ::HeapSize(::GetProcessHeap(), 0,
+                                     const_cast<void*>(buffer));

     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error
     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error


@@ -702,18 +703,7 @@ const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
 
     *size = realsz;
 
 
     *size = realsz;
 

-    // check if this data has its size prepended (as it was by default for wx
-    // programs prior 2.6.3):
-    size_t *p = (size_t *)buffer;
-    if ( *p == realsz )
-    {
-        if ( NeedsVerbatimData(format) )
-            wxLogDebug(wxT("Apparent data format mismatch: size not needed"));
-
-        p++; // this data has its size prepended; skip first DWORD
-    }
-
-    return p;
+    return buffer;

 }
 
 void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
 }
 
 void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,


@@ -1139,7 +1129,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
 #endif // wxUSE_UNICODE_MSLU
         {
             len = m_filenames[i].length();
 #endif // wxUSE_UNICODE_MSLU
         {
             len = m_filenames[i].length();

-            memcpy(pbuf, m_filenames[i].c_str(), len*sizeOfChar);
+            memcpy(pbuf, m_filenames[i].wx_str(), len*sizeOfChar);

         }
 
         pbuf += len*sizeOfChar;
         }
 
         pbuf += len*sizeOfChar;


@@ -1216,9 +1206,9 @@ public:
 
 wxURLDataObject::wxURLDataObject(const wxString& url)
 {
 
 wxURLDataObject::wxURLDataObject(const wxString& url)
 {

-    // we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same
-    // but it seems that some browsers only provide one of them so we have to
-    // support both
+    // we support CF_TEXT and CFSTR_SHELLURL formats which are basically the
+    // same but it seems that some browsers only provide one of them so we have
+    // to support both

     Add(new wxTextDataObject);
     Add(new CFSTR_SHELLURLDataObject());
 
     Add(new wxTextDataObject);
     Add(new CFSTR_SHELLURLDataObject());
 


@@ -1255,13 +1245,19 @@ wxString wxURLDataObject::GetURL() const
 
 void wxURLDataObject::SetURL(const wxString& url)
 {
 
 void wxURLDataObject::SetURL(const wxString& url)
 {

-    SetData(wxDataFormat(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT),
-            url.Length()+1, url.c_str());
+    wxCharBuffer urlMB(url.mb_str());
+    if ( urlMB )
+    {
+        const size_t len = strlen(urlMB) + 1; // size with trailing NUL
+#if !wxUSE_UNICODE
+        SetData(wxDF_TEXT, len, urlMB);
+#endif
+        SetData(wxDataFormat(CFSTR_SHELLURL), len, urlMB);
+    }

 
 

-    // CFSTR_SHELLURL is always supposed to be ANSI...
-    wxWX2MBbuf urlA = (wxWX2MBbuf)url.mbc_str();
-    size_t len = strlen(urlA);
-    SetData(wxDataFormat(CFSTR_SHELLURL), len+1, (const char*)urlA);
+#if wxUSE_UNICODE
+    SetData(wxDF_UNICODETEXT, url.length() + 1, url.wc_str());
+#endif

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