Patch from Will Sadkin:

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index ded312e08d9547c79bdf2a033abf4e60d20aa6d4..70667b9e07b11a79981fcf01e9c246f0cae8d85e 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -686,8 +686,8 @@ 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);
-    if ( realsz == (SIZE_T)-1 )
+    size_t realsz = ::HeapSize(::GetProcessHeap(), 0, buffer);
+    if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error
         wxLogApiError(wxT("HeapSize"), 0);
@@ -1163,7 +1163,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 +1173,9 @@ wxURLDataObject::wxURLDataObject()
 
     // we don't have any data yet
     m_dataObjectLast = NULL;
+
+    if ( !url.empty() )
+        SetURL(url);
 }
 
 bool wxURLDataObject::SetData(const wxDataFormat& format,