X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19193a2c85987b595932957e73013e7ea100f0e8..24f932d22a085ce899b94c98578f475782c75bf6:/src/os2/clipbrd.cpp diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp index 2618dc6885..9c0ed072cf 100644 --- a/src/os2/clipbrd.cpp +++ b/src/os2/clipbrd.cpp @@ -481,7 +481,7 @@ bool wxClipboard::AddData( wxDataObject *data ) #if wxUSE_DRAG_AND_DROP wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") ); -// wxDataFormat format = data->GetFormat(); +// wxDataFormat format = data->GetPreferredFormat(); // TODO: /* switch ( format ) @@ -499,7 +499,7 @@ bool wxClipboard::AddData( wxDataObject *data ) { wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data; wxBitmap bitmap(bitmapDataObject->GetBitmap()); - return wxSetClipboardData(data->GetFormat(), &bitmap); + return wxSetClipboardData(data->GetPreferredFormat(), &bitmap); } #if wxUSE_METAFILE @@ -540,7 +540,7 @@ bool wxClipboard::GetData( wxDataObject& data ) wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") ); #if wxUSE_DRAG_AND_DROP -// wxDataFormat format = data.GetFormat(); +// wxDataFormat format = data.GetPreferredFormat(); // TODO: /* switch ( format ) @@ -564,7 +564,7 @@ bool wxClipboard::GetData( wxDataObject& data ) case wxDF_DIB: { wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data; - wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat()); + wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetPreferredFormat()); if (bitmap) { bitmapDataObject.SetBitmap(* bitmap);