Applied Diana's font patch II

[wxWidgets.git] / src / msw / clipbrd.cpp

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index b741d8fa1ae93c8e6735044b5cda57a3c55c604d..cd94dce908685bbdf0357e581de4515b5fd63f0c 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -142,7 +142,8 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 #if wxUSE_DRAG_AND_DROP
 static bool wxSetClipboardData(wxDataObject *data)
 {
-    size_t size = data->GetDataSize();
+    wxDataFormat format = data->GetPreferredFormat();
+    size_t size = data->GetDataSize(format);
     HANDLE hGlobal = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, size);
     if ( !hGlobal )
     {
@@ -154,11 +155,10 @@ static bool wxSetClipboardData(wxDataObject *data)
 
     LPVOID lpGlobalMemory = ::GlobalLock(hGlobal);
 
-    data->GetDataHere(lpGlobalMemory);
+    data->GetDataHere(format, lpGlobalMemory);
 
     GlobalUnlock(hGlobal);
 
-    wxDataFormat format = data->GetPreferredFormat();
     if ( !::SetClipboardData(format, hGlobal) )
     {
         wxLogSysError(_("Failed to set clipboard data in format %s"),