Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clipboard update and latest module definition file of .dll build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-01-07 18:08:23 +00:00
parent 793c7f9b9c
commit 2dab12be49
2 changed files with 86 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/os2/clipbrd.cpp
View File

@@ -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);