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 424c1c45244206e0dfd1a54e5fa07e5913c2fba3..cd94dce908685bbdf0357e581de4515b5fd63f0c 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -81,7 +81,7 @@ static bool gs_wxClipboardIsOpen = FALSE;
 
 bool wxOpenClipboard()
 {
-    wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, T("clipboard already opened.") );
+    wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, wxT("clipboard already opened.") );
 
     wxWindow *win = wxTheApp->GetTopWindow();
     if ( win )
@@ -95,7 +95,7 @@ bool wxOpenClipboard()
     }
     else
     {
-        wxLogDebug(T("Can not open clipboard without a main window."));
+        wxLogDebug(wxT("Can not open clipboard without a main window."));
 
         return FALSE;
     }
@@ -103,7 +103,7 @@ bool wxOpenClipboard()
 
 bool wxCloseClipboard()
 {
-    wxCHECK_MSG( gs_wxClipboardIsOpen, FALSE, T("clipboard is not opened") );
+    wxCHECK_MSG( gs_wxClipboardIsOpen, FALSE, wxT("clipboard is not opened") );
 
     gs_wxClipboardIsOpen = FALSE;
 
@@ -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"),
@@ -470,10 +470,10 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
-    wxCHECK_MSG( data, FALSE, T("data is invalid") );
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 
 #if wxUSE_DRAG_AND_DROP
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, T("clipboard not open") );
+    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
     wxDataFormat format = data->GetFormat();
 
@@ -527,7 +527,7 @@ bool wxClipboard::IsSupported( wxDataFormat format )
 
 bool wxClipboard::GetData( wxDataObject *data )
 {
-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, T("clipboard not open") );
+    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #if wxUSE_DRAG_AND_DROP
     wxDataFormat format = data->GetFormat();