X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51d0522672056dd75a5bb18ede69baf2d1a46bc4..f164c52bc761d08cbfe5b733198e9d21afc3c221:/src/msw/ole/dataobj.cpp?ds=sidebyside

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 408a2599b9..50eea047b9 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -686,7 +686,10 @@ size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )
 const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
                                                const wxDataFormat& format )
 {
-    size_t realsz = ::HeapSize(::GetProcessHeap(), 0, buffer);
+    // 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));
     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error
@@ -1163,7 +1166,7 @@ public:
 
 
 
-wxURLDataObject::wxURLDataObject()
+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
@@ -1173,6 +1176,9 @@ wxURLDataObject::wxURLDataObject()
 
     // we don't have any data yet
     m_dataObjectLast = NULL;
+
+    if ( !url.empty() )
+        SetURL(url);
 }
 
 bool wxURLDataObject::SetData(const wxDataFormat& format,